0
0
mirror of https://hub.spigotmc.org/stash/scm/spigot/craftbukkit.git synced 2025-04-15 19:35:35 +00:00
Files
nms-patches
net
minecraft
advancements
commands
core
nbt
network
server
stats
util
world
damagesource
effect
entity
ai
ambient
animal
allay
armadillo
axolotl
camel
Camel.patch
frog
goat
horse
sheep
sniffer
wolf
AbstractCow.patch
Bucketable.patch
EntityAnimal.patch
EntityBee.patch
EntityCat.patch
EntityChicken.patch
EntityDolphin.patch
EntityFox.patch
EntityIronGolem.patch
EntityMushroomCow.patch
EntityOcelot.patch
EntityPanda.patch
EntityParrot.patch
EntityPerchable.patch
EntityPig.patch
EntityPufferFish.patch
EntityRabbit.patch
EntitySnowman.patch
EntityTurtle.patch
boss
decoration
item
monster
npc
player
projectile
raid
vehicle
ConversionType.patch
Entity.patch
EntityAgeable.patch
EntityAreaEffectCloud.patch
EntityCreature.patch
EntityExperienceOrb.patch
EntityInsentient.patch
EntityLightning.patch
EntityLiving.patch
EntityTameableAnimal.patch
EntityTypes.patch
IEntityAngerable.patch
IEntitySelector.patch
Interaction.patch
Leashable.patch
SaddleStorage.patch
food
inventory
item
level
IInventory.patch
InventoryLargeChest.patch
InventorySubcontainer.patch
CrashReport.patch
src
.gitignore
CONTRIBUTING.md
LGPL.txt
LICENCE.txt
README.md
applyPatches.sh
checkstyle.xml
makePatches.sh
pom.xml
2025-03-26 03:05:00 +11:00

41 lines
1.5 KiB
Diff

--- a/net/minecraft/world/entity/animal/camel/Camel.java
+++ b/net/minecraft/world/entity/animal/camel/Camel.java
@@ -55,6 +55,10 @@
import net.minecraft.world.phys.Vec2F;
import net.minecraft.world.phys.Vec3D;
+// CraftBukkit start
+import org.bukkit.event.entity.EntityDamageEvent;
+// CraftBukkit end
+
public class Camel extends EntityHorseAbstract {
public static final float BABY_SCALE = 0.45F;
@@ -153,7 +157,7 @@
GameProfilerFiller gameprofilerfiller = Profiler.get();
gameprofilerfiller.push("camelBrain");
- BehaviorController<?> behaviorcontroller = this.getBrain();
+ BehaviorController<Camel> behaviorcontroller = (BehaviorController<Camel>) this.getBrain(); // CraftBukkit - decompile error
behaviorcontroller.tick(worldserver, this);
gameprofilerfiller.pop();
@@ -464,9 +468,15 @@
}
@Override
- protected void actuallyHurt(WorldServer worldserver, DamageSource damagesource, float f) {
+ // CraftBukkit start - void -> boolean
+ public boolean actuallyHurt(WorldServer worldserver, DamageSource damagesource, float f, EntityDamageEvent event) {
+ boolean damageResult = super.actuallyHurt(worldserver, damagesource, f, event);
+ if (!damageResult) {
+ return false;
+ }
+ // CraftBukkit end
this.standUpInstantly();
- super.actuallyHurt(worldserver, damagesource, f);
+ return true; // CraftBukkit
}
@Override