mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-27 04:55:47 +01:00
be13705177
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 6b8cd9a7 SPIGOT-6207: forcibly drop the items of a converted zombie villager
48 lines
2.5 KiB
Diff
48 lines
2.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: MisterVector <whizkid3000@hotmail.com>
|
|
Date: Tue, 13 Aug 2019 19:45:06 -0700
|
|
Subject: [PATCH] Implement PlayerFlowerPotManipulateEvent
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/block/BlockFlowerPot.java b/src/main/java/net/minecraft/world/level/block/BlockFlowerPot.java
|
|
index a61d1ffeebfd00a5fcd5faf95200b0640da8ea82..18fefad056d92a6fa498ab3764cd391446c26b60 100644
|
|
--- a/src/main/java/net/minecraft/world/level/block/BlockFlowerPot.java
|
|
+++ b/src/main/java/net/minecraft/world/level/block/BlockFlowerPot.java
|
|
@@ -21,6 +21,8 @@ import net.minecraft.world.phys.MovingObjectPositionBlock;
|
|
import net.minecraft.world.phys.shapes.VoxelShape;
|
|
import net.minecraft.world.phys.shapes.VoxelShapeCollision;
|
|
|
|
+import io.papermc.paper.event.player.PlayerFlowerPotManipulateEvent; // Paper
|
|
+
|
|
public class BlockFlowerPot extends Block {
|
|
|
|
private static final Map<Block, Block> b = Maps.newHashMap();
|
|
@@ -52,6 +54,27 @@ public class BlockFlowerPot extends Block {
|
|
boolean flag1 = this.c == Blocks.AIR;
|
|
|
|
if (flag != flag1) {
|
|
+ // Paper start
|
|
+ org.bukkit.entity.Player player = (org.bukkit.entity.Player) entityhuman.getBukkitEntity();
|
|
+ boolean placing = flag1;
|
|
+ org.bukkit.block.Block bukkitblock = org.bukkit.craftbukkit.block.CraftBlock.at(world, blockposition);
|
|
+ org.bukkit.inventory.ItemStack bukkititemstack = org.bukkit.craftbukkit.inventory.CraftItemStack.asBukkitCopy(itemstack);
|
|
+ org.bukkit.Material mat = org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(c);
|
|
+ org.bukkit.inventory.ItemStack bukkititemstack1 = new org.bukkit.inventory.ItemStack(mat, 1);
|
|
+ org.bukkit.inventory.ItemStack whichitem = placing ? bukkititemstack : bukkititemstack1;
|
|
+
|
|
+ PlayerFlowerPotManipulateEvent event = new PlayerFlowerPotManipulateEvent(player, bukkitblock, whichitem, placing);
|
|
+ player.getServer().getPluginManager().callEvent(event);
|
|
+
|
|
+ if (event.isCancelled()) {
|
|
+ // Update client
|
|
+ player.sendBlockChange(bukkitblock.getLocation(), bukkitblock.getBlockData());
|
|
+ player.updateInventory();
|
|
+
|
|
+ return EnumInteractionResult.PASS;
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
if (flag1) {
|
|
world.setTypeAndData(blockposition, block.getBlockData(), 3);
|
|
entityhuman.a(StatisticList.POT_FLOWER);
|