Paper/patches/unapplied/server/0488-Add-PlayerFlowerPotManipulateEvent.patch

33 lines
1.9 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
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] Add PlayerFlowerPotManipulateEvent
2021-06-11 14:02:28 +02:00
diff --git a/src/main/java/net/minecraft/world/level/block/FlowerPotBlock.java b/src/main/java/net/minecraft/world/level/block/FlowerPotBlock.java
index cb77c7af329dd9fa8dc28ee3cfc475baa4b1392b..8e8fa6e0823258220b604ceef8e1f5ae15556b9a 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/world/level/block/FlowerPotBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/FlowerPotBlock.java
2024-02-01 10:15:57 +01:00
@@ -66,6 +66,21 @@ public class FlowerPotBlock extends Block {
2021-06-14 20:50:22 +02:00
boolean bl = blockState.is(Blocks.AIR);
boolean bl2 = this.isEmpty();
if (bl != bl2) {
+ // Paper start - Add PlayerFlowerPotManipulateEvent
2024-02-01 10:15:57 +01:00
+ boolean placing = bl2; // OBFHELPER
+ org.bukkit.block.Block block = org.bukkit.craftbukkit.block.CraftBlock.at(world, pos);
+ org.bukkit.inventory.ItemStack placedStack = org.bukkit.craftbukkit.inventory.CraftItemStack.asBukkitCopy(itemStack);
+ org.bukkit.inventory.ItemStack pottedStack = new org.bukkit.inventory.ItemStack(org.bukkit.craftbukkit.block.CraftBlockType.minecraftToBukkit(this.potted));
+ org.bukkit.inventory.ItemStack stack = placing ? placedStack : pottedStack;
2021-06-11 14:02:28 +02:00
+
2024-02-01 10:15:57 +01:00
+ io.papermc.paper.event.player.PlayerFlowerPotManipulateEvent event = new io.papermc.paper.event.player.PlayerFlowerPotManipulateEvent((org.bukkit.entity.Player) player.getBukkitEntity(), block, stack, placing);
+ if (!event.callEvent()) {
2021-06-11 14:02:28 +02:00
+ // Update client
2024-02-01 10:15:57 +01:00
+ player.containerMenu.sendAllDataToRemote();
2021-06-11 14:02:28 +02:00
+
+ return InteractionResult.PASS;
+ }
+ // Paper end - Add PlayerFlowerPotManipulateEvent
2021-06-14 20:50:22 +02:00
if (bl2) {
world.setBlock(pos, blockState, 3);
2021-06-11 14:02:28 +02:00
player.awardStat(Stats.POT_FLOWER);