3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-28 00:50:08 +01:00
Paper/nms-patches/EntityRabbit.patch

42 Zeilen
1.9 KiB
Diff

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/EntityRabbit.java
+++ b/net/minecraft/server/EntityRabbit.java
2018-07-15 02:00:00 +02:00
@@ -17,8 +17,14 @@
2016-02-29 22:32:46 +01:00
this.setSize(0.4F, 0.5F);
2018-07-15 02:00:00 +02:00
this.h = new EntityRabbit.ControllerJumpRabbit(this);
2015-02-26 23:41:06 +01:00
this.moveController = new EntityRabbit.ControllerMoveRabbit(this);
2014-12-06 22:45:51 +01:00
+ this.initializePathFinderGoals(); // CraftBukkit - moved code
+ }
2015-02-26 23:41:06 +01:00
+
2014-12-06 22:45:51 +01:00
+ // CraftBukkit start - code from constructor
+ public void initializePathFinderGoals(){
2016-02-29 22:32:46 +01:00
this.c(0.0D);
2014-12-06 22:45:51 +01:00
}
+ // CraftBukkit end
2018-07-15 02:00:00 +02:00
protected void n() {
2016-02-29 22:32:46 +01:00
this.goalSelector.a(1, new PathfinderGoalFloat(this));
2018-12-13 01:00:00 +01:00
@@ -393,9 +399,23 @@
Integer integer = (Integer) iblockdata.get(BlockCarrots.AGE);
2018-12-06 00:00:00 +01:00
if (integer == 0) {
+ // CraftBukkit start
2018-12-13 01:00:00 +01:00
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.entity, blockposition, Blocks.AIR.getBlockData()).isCancelled()) {
+ return;
+ }
+ // CraftBukkit end
world.setTypeAndData(blockposition, Blocks.AIR.getBlockData(), 2);
world.setAir(blockposition, true);
} else {
+ // CraftBukkit start
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(
2018-12-13 01:00:00 +01:00
+ this.entity,
2016-07-08 03:12:40 +02:00
+ blockposition,
2018-12-06 00:00:00 +01:00
+ iblockdata.set(BlockCarrots.AGE, integer - 1)
+ ).isCancelled()) {
+ return;
+ }
+ // CraftBukkit end
2018-12-06 00:00:00 +01:00
world.setTypeAndData(blockposition, (IBlockData) iblockdata.set(BlockCarrots.AGE, integer - 1), 2);
world.triggerEffect(2001, blockposition, Block.getCombinedId(iblockdata));
}