PaperMC/nms-patches/EntityTurtle.patch

45 lines
2.2 KiB
Diff
Raw Normal View History

--- a/net/minecraft/server/EntityTurtle.java
+++ b/net/minecraft/server/EntityTurtle.java
2019-12-10 23:00:00 +01:00
@@ -255,7 +255,9 @@
2018-07-24 14:22:56 +02:00
protected void l() {
super.l();
2019-06-21 12:00:00 +02:00
if (!this.isBaby() && this.world.getGameRules().getBoolean(GameRules.DO_MOB_LOOT)) {
2018-08-26 04:00:00 +02:00
+ this.forceDrops = true; // CraftBukkit
this.a((IMaterial) Items.SCUTE, 1);
+ this.forceDrops = false; // CraftBukkit
}
2018-07-24 14:22:56 +02:00
2018-08-26 04:00:00 +02:00
}
2019-12-10 23:00:00 +01:00
@@ -282,7 +284,9 @@
2019-04-23 04:00:00 +02:00
@Override
public void onLightningStrike(EntityLightning entitylightning) {
+ org.bukkit.craftbukkit.event.CraftEventFactory.entityDamage = entitylightning; // CraftBukkit
this.damageEntity(DamageSource.LIGHTNING, Float.MAX_VALUE);
+ org.bukkit.craftbukkit.event.CraftEventFactory.entityDamage = null; // CraftBukkit
}
2019-04-23 04:00:00 +02:00
static class g extends NavigationGuardian {
2019-12-10 23:00:00 +01:00
@@ -443,8 +447,12 @@
} else if (this.g.bD > 200) {
2019-04-23 04:00:00 +02:00
World world = this.g.world;
+ // CraftBukkit start
2019-04-23 04:00:00 +02:00
+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.g, this.e.up(), (IBlockData) Blocks.TURTLE_EGG.getBlockData().set(BlockTurtleEgg.b, this.g.random.nextInt(4) + 1)).isCancelled()) {
2019-07-20 01:00:00 +02:00
world.playSound((EntityHuman) null, blockposition, SoundEffects.ENTITY_TURTLE_LAY_EGG, SoundCategory.BLOCKS, 0.3F, 0.9F + world.random.nextFloat() * 0.2F);
2019-04-23 04:00:00 +02:00
world.setTypeAndData(this.e.up(), (IBlockData) Blocks.TURTLE_EGG.getBlockData().set(BlockTurtleEgg.b, this.g.random.nextInt(4) + 1), 3);
+ }
+ // CraftBukkit end
2019-04-23 04:00:00 +02:00
this.g.r(false);
this.g.s(false);
this.g.setLoveTicks(600);
2019-12-10 23:00:00 +01:00
@@ -530,7 +538,7 @@
2019-04-23 04:00:00 +02:00
--this.e;
return false;
} else {
- this.d = this.b.world.a(EntityTurtle.i.a, (EntityLiving) this.b);
+ this.d = this.b.world.a(this.a, (EntityLiving) this.b); // CraftBukkit - decompile error
return this.d == null ? false : this.a(this.d.getItemInMainHand()) || this.a(this.d.getItemInOffHand());
}
}