mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-27 04:55:47 +01:00
69 lines
4.1 KiB
Diff
69 lines
4.1 KiB
Diff
|
--- a/net/minecraft/server/BehaviorFarm.java
|
||
|
|
+++ b/net/minecraft/server/BehaviorFarm.java
|
||
|
|
@@ -31,7 +31,7 @@
|
||
|
|
} else if (entityvillager.getVillagerData().getProfession() != VillagerProfession.FARMER) {
|
||
|
|
return false;
|
||
|
|
} else {
|
||
|
|
- Set<BlockPosition> set = (Set) ((List) entityvillager.getBehaviorController().c(MemoryModuleType.SECONDARY_JOB_SITE).get()).stream().map(GlobalPos::b).collect(Collectors.toSet());
|
||
|
|
+ Set<BlockPosition> set = (Set) (entityvillager.getBehaviorController().c(MemoryModuleType.SECONDARY_JOB_SITE).get()).stream().map(GlobalPos::b).collect(Collectors.toSet()); // CraftBukkit - decompile error
|
||
|
|
BlockPosition blockposition = new BlockPosition(entityvillager);
|
||
|
|
Stream stream = ImmutableList.of(blockposition.down(), blockposition.south(), blockposition.north(), blockposition.east(), blockposition.west()).stream();
|
||
|
|
|
||
|
|
@@ -61,8 +61,8 @@
|
||
|
|
|
||
|
|
protected void a(WorldServer worldserver, EntityVillager entityvillager, long i) {
|
||
|
|
if (i > this.d && this.a != null) {
|
||
|
|
- entityvillager.getBehaviorController().a(MemoryModuleType.LOOK_TARGET, (Object) (new BehaviorTarget(this.a)));
|
||
|
|
- entityvillager.getBehaviorController().a(MemoryModuleType.WALK_TARGET, (Object) (new MemoryTarget(new BehaviorTarget(this.a), 0.5F, 1)));
|
||
|
|
+ entityvillager.getBehaviorController().a(MemoryModuleType.LOOK_TARGET, (new BehaviorTarget(this.a))); // CraftBukkit - decompile error
|
||
|
|
+ entityvillager.getBehaviorController().a(MemoryModuleType.WALK_TARGET, (new MemoryTarget(new BehaviorTarget(this.a), 0.5F, 1))); // CraftBukkit - decompile error
|
||
|
|
}
|
||
|
|
|
||
|
|
}
|
||
|
|
@@ -80,7 +80,11 @@
|
||
|
|
Block block = iblockdata.getBlock();
|
||
|
|
|
||
|
|
if (block instanceof BlockCrops && ((BlockCrops) block).isRipe(iblockdata) && this.c) {
|
||
|
|
- worldserver.b(this.a, true);
|
||
|
|
+ // CraftBukkit start
|
||
|
|
+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(entityvillager, this.a, Blocks.AIR.getBlockData()).isCancelled()) {
|
||
|
|
+ worldserver.b(this.a, true);
|
||
|
|
+ }
|
||
|
|
+ // CraftBukkit end
|
||
|
|
} else if (iblockdata.isAir() && this.b) {
|
||
|
|
InventorySubcontainer inventorysubcontainer = entityvillager.getInventory();
|
||
|
|
|
||
|
|
@@ -89,19 +93,28 @@
|
||
|
|
boolean flag = false;
|
||
|
|
|
||
|
|
if (!itemstack.isEmpty()) {
|
||
|
|
+ // CraftBukkit start
|
||
|
|
+ Block planted = null;
|
||
|
|
if (itemstack.getItem() == Items.WHEAT_SEEDS) {
|
||
|
|
- worldserver.setTypeAndData(this.a, Blocks.WHEAT.getBlockData(), 3);
|
||
|
|
+ planted = Blocks.WHEAT;
|
||
|
|
flag = true;
|
||
|
|
} else if (itemstack.getItem() == Items.POTATO) {
|
||
|
|
- worldserver.setTypeAndData(this.a, Blocks.POTATOES.getBlockData(), 3);
|
||
|
|
+ planted = Blocks.POTATOES;
|
||
|
|
flag = true;
|
||
|
|
} else if (itemstack.getItem() == Items.CARROT) {
|
||
|
|
- worldserver.setTypeAndData(this.a, Blocks.CARROTS.getBlockData(), 3);
|
||
|
|
+ planted = Blocks.CARROTS;
|
||
|
|
flag = true;
|
||
|
|
} else if (itemstack.getItem() == Items.BEETROOT_SEEDS) {
|
||
|
|
- worldserver.setTypeAndData(this.a, Blocks.BEETROOTS.getBlockData(), 3);
|
||
|
|
+ planted = Blocks.BEETROOTS;
|
||
|
|
flag = true;
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ if (planted != null && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(entityvillager, this.a, planted.getBlockData()).isCancelled()) {
|
||
|
|
+ worldserver.setTypeAndData(this.a, planted.getBlockData(), 3);
|
||
|
|
+ } else {
|
||
|
|
+ flag = false;
|
||
|
|
+ }
|
||
|
|
+ // CraftBukkit end
|
||
|
|
}
|
||
|
|
|
||
|
|
if (flag) {
|