twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-11 18:22:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

SPIGOT-5889: Villager using composter should call EntityChangeBlockEvent

Browse Source
This commit is contained in:
Parker Hawke
2020-06-30 12:18:39 +10:00
committed by md_5
parent 2fe6b4a320
commit d47c47ee59
4 changed files with 80 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
nms-patches/BlockComposter.patch
View File

@@ -1,10 +1,13 @@
--- a/net/minecraft/server/BlockComposter.java
+++ b/net/minecraft/server/BlockComposter.java
@@ -4,13 +4,14 @@
@@ -4,13 +4,17 @@
import it.unimi.dsi.fastutil.objects.Object2FloatOpenHashMap;
import java.util.Random;
import javax.annotation.Nullable;
+import org.bukkit.craftbukkit.inventory.CraftBlockInventoryHolder; // CraftBukkit
+// CraftBukkit start
+import org.bukkit.craftbukkit.inventory.CraftBlockInventoryHolder;
+import org.bukkit.craftbukkit.util.DummyGeneratorAccess;
+// CraftBukkit end
public class BlockComposter extends Block implements IInventoryHolder {
@@ -16,7 +19,27 @@
for (int i = 0; i < 8; ++i) {
avoxelshape[i] = VoxelShapes.a(BlockComposter.c, Block.a(2.0D, (double) Math.max(2, 1 + i * 2), 2.0D, 14.0D, 16.0D, 14.0D), OperatorBoolean.ONLY_FIRST);
}
@@ -254,7 +255,8 @@
@@ -163,11 +167,17 @@
}
}
- public static IBlockData a(IBlockData iblockdata, WorldServer worldserver, ItemStack itemstack, BlockPosition blockposition) {
+ public static IBlockData a(IBlockData iblockdata, WorldServer worldserver, ItemStack itemstack, BlockPosition blockposition, EntityVillager entity) { // CraftBukkit
int i = (Integer) iblockdata.get(BlockComposter.a);
if (i < 7 && BlockComposter.b.containsKey(itemstack.getItem())) {
- IBlockData iblockdata1 = b(iblockdata, (GeneratorAccess) worldserver, blockposition, itemstack);
+ // CraftBukkit start
+ IBlockData iblockdata1 = b(iblockdata, DummyGeneratorAccess.INSTANCE, blockposition, itemstack);
+ if (iblockdata == iblockdata1 || org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(entity, blockposition, iblockdata1).isCancelled()) {
+ return iblockdata;
+ }
+ iblockdata1 = b(iblockdata, (GeneratorAccess) worldserver, blockposition, itemstack);
+ // CraftBukkit end
itemstack.subtract(1);
worldserver.triggerEffect(1500, blockposition, iblockdata != iblockdata1 ? 1 : 0);
@@ -254,7 +264,8 @@
public IWorldInventory a(IBlockData iblockdata, GeneratorAccess generatoraccess, BlockPosition blockposition) {
int i = (Integer) iblockdata.get(BlockComposter.a);
@@ -26,7 +49,7 @@
}
static class ContainerInput extends InventorySubcontainer implements IWorldInventory {
@@ -266,6 +268,7 @@
@@ -266,6 +277,7 @@
public ContainerInput(IBlockData iblockdata, GeneratorAccess generatoraccess, BlockPosition blockposition) {
super(1);
@@ -34,7 +57,7 @@
this.a = iblockdata;
this.b = generatoraccess;
this.c = blockposition;
@@ -318,6 +321,7 @@
@@ -318,6 +330,7 @@
this.blockData = iblockdata;
this.generatorAccess = generatoraccess;
this.blockPosition = blockposition;
@@ -42,7 +65,7 @@
}
@Override
@@ -342,15 +346,23 @@
@@ -342,15 +355,23 @@
@Override
public void update() {