2018-01-18 06:00:51 +00:00
|
|
|
From 00c177bbfbcca2f9de95bbbcea6f679d18bc310d Mon Sep 17 00:00:00 2001
|
2018-02-11 10:52:04 +00:00
|
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
|
|
|
|
Date: Sun, 11 Feb 2018 10:43:46 +0000
|
|
|
|
|
Subject: [PATCH] Close Structure Window when PlayerInteractEvent is cancelled
|
|
|
|
|
|
|
|
|
|
This is opened on the client, and so we send a CloseWindow packet
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
|
|
|
|
|
index 5ec7f5819..08b1dc0b2 100644
|
|
|
|
|
--- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
|
|
|
|
|
@@ -468,6 +468,8 @@ public class PlayerInteractManager {
|
|
|
|
|
((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutBlockChange(world, bottom ? blockposition.up() : blockposition.down()));
|
|
|
|
|
} else if (blockdata.getBlock() instanceof BlockCake) {
|
|
|
|
|
((EntityPlayer) entityhuman).getBukkitEntity().sendHealthUpdate(); // SPIGOT-1341 - reset health for cake
|
|
|
|
|
+ } else if (blockdata.getBlock() instanceof BlockStructure) { // Paper - close Structure window when PIE is cancelled
|
|
|
|
|
+ ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutCloseWindow()); // Paper - close Structure window when PIE is cancelled
|
|
|
|
|
}
|
|
|
|
|
((EntityPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-2867
|
|
|
|
|
enuminteractionresult = (event.useItemInHand() != Event.Result.ALLOW) ? EnumInteractionResult.SUCCESS : EnumInteractionResult.PASS;
|
|
|
|
|
--
|
|
|
|
|
2.16.1
|
|
|
|
|
|
