mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-18 12:48:53 +01:00
da9d110d5b
This patch does not appear to be doing anything useful, and may hide errors. Currently, the save logic does not run through this path either so it did not do anything. Additionally, properly implement support for handling RegionFileSizeException in Moonrise.
48 lines
2.8 KiB
Diff
48 lines
2.8 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] Add PlayerFlowerPotManipulateEvent
|
|
|
|
|
|
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 c6de1b6587b300404c38c27f566c80de11bc0814..bee71ed48365694c488af88317a738fc6a4e5893 100644
|
|
--- a/src/main/java/net/minecraft/world/level/block/FlowerPotBlock.java
|
|
+++ b/src/main/java/net/minecraft/world/level/block/FlowerPotBlock.java
|
|
@@ -61,6 +61,18 @@ public class FlowerPotBlock extends Block {
|
|
} else if (!this.isEmpty()) {
|
|
return InteractionResult.CONSUME;
|
|
} else {
|
|
+ // Paper start - Add PlayerFlowerPotManipulateEvent
|
|
+ org.bukkit.block.Block block = org.bukkit.craftbukkit.block.CraftBlock.at(world, pos);
|
|
+ org.bukkit.inventory.ItemStack placedStack = org.bukkit.craftbukkit.inventory.CraftItemStack.asBukkitCopy(stack);
|
|
+
|
|
+ io.papermc.paper.event.player.PlayerFlowerPotManipulateEvent event = new io.papermc.paper.event.player.PlayerFlowerPotManipulateEvent((org.bukkit.entity.Player) player.getBukkitEntity(), block, placedStack, true);
|
|
+ if (!event.callEvent()) {
|
|
+ // Update client
|
|
+ player.containerMenu.sendAllDataToRemote();
|
|
+
|
|
+ return InteractionResult.CONSUME;
|
|
+ }
|
|
+ // Paper end - Add PlayerFlowerPotManipulateEvent
|
|
world.setBlock(pos, blockState, 3);
|
|
world.gameEvent(player, GameEvent.BLOCK_CHANGE, pos);
|
|
player.awardStat(Stats.POT_FLOWER);
|
|
@@ -75,6 +87,18 @@ public class FlowerPotBlock extends Block {
|
|
return InteractionResult.CONSUME;
|
|
} else {
|
|
ItemStack itemStack = new ItemStack(this.potted);
|
|
+ // Paper start - Add PlayerFlowerPotManipulateEvent
|
|
+ org.bukkit.block.Block block = org.bukkit.craftbukkit.block.CraftBlock.at(world, pos);
|
|
+ org.bukkit.inventory.ItemStack pottedStack = new org.bukkit.inventory.ItemStack(org.bukkit.craftbukkit.block.CraftBlockType.minecraftToBukkit(this.potted));
|
|
+
|
|
+ io.papermc.paper.event.player.PlayerFlowerPotManipulateEvent event = new io.papermc.paper.event.player.PlayerFlowerPotManipulateEvent((org.bukkit.entity.Player) player.getBukkitEntity(), block, pottedStack, false);
|
|
+ if (!event.callEvent()) {
|
|
+ // Update client
|
|
+ player.containerMenu.sendAllDataToRemote();
|
|
+
|
|
+ return InteractionResult.PASS;
|
|
+ }
|
|
+ // Paper end - Add PlayerFlowerPotManipulateEvent
|
|
if (!player.addItem(itemStack)) {
|
|
player.drop(itemStack, false);
|
|
}
|