Paper/Spigot-Server-Patches/0630-Implement-PlayerFlowerPotManipulateEvent.patch
Shane Freeder e886d8118e
Updated Upstream ()
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
2021-02-06 00:00:18 +00:00

48 lines
2.4 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/server/BlockFlowerPot.java b/src/main/java/net/minecraft/server/BlockFlowerPot.java
index d776277e89d8faa500749f38e0ea79b4a7a7bc35..c2b3d73c6477f4137f6d2724f9e629939a8e5177 100644
--- a/src/main/java/net/minecraft/server/BlockFlowerPot.java
+++ b/src/main/java/net/minecraft/server/BlockFlowerPot.java
@@ -3,6 +3,8 @@ package net.minecraft.server;
import com.google.common.collect.Maps;
import java.util.Map;
+import io.papermc.paper.event.player.PlayerFlowerPotManipulateEvent; // Paper
+
public class BlockFlowerPot extends Block {
private static final Map<Block, Block> b = Maps.newHashMap();
@@ -34,6 +36,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);