2018-06-30 07:40:52 +02:00
|
|
|
From c560723f16f4031e744c72e218e20b0153c35e3f Mon Sep 17 00:00:00 2001
|
2018-02-11 11:52:04 +01:00
|
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
|
|
|
Date: Sun, 11 Feb 2018 10:43:46 +0000
|
2018-02-18 15:39:02 +01:00
|
|
|
Subject: [PATCH] Extend Player Interact cancellation to GUIs
|
2018-02-11 11:52:04 +01:00
|
|
|
|
2018-02-18 15:39:02 +01:00
|
|
|
GUIs are opened on the client, meaning that the server cannot block them from opening,
|
|
|
|
However, it is possible to close these GUIs from the server.
|
2018-02-11 11:52:04 +01:00
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
|
2018-06-30 07:40:52 +02:00
|
|
|
index 5ec7f5819..b1cdb2154 100644
|
2018-02-11 11:52:04 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
|
2018-02-18 15:39:02 +01:00
|
|
|
@@ -468,6 +468,12 @@ public class PlayerInteractManager {
|
2018-02-11 11:52:04 +01:00
|
|
|
((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
|
2018-02-18 15:39:02 +01:00
|
|
|
+ // Paper start - extend Player Interact cancellation to GUIs
|
|
|
|
+ } else if (blockdata.getBlock() instanceof BlockStructure) {
|
|
|
|
+ ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutCloseWindow());
|
|
|
|
+ } else if (blockdata.getBlock() instanceof BlockCommand) {
|
|
|
|
+ ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutCloseWindow());
|
|
|
|
+ // Paper end - extend Player Interact cancellation to GUIs
|
2018-02-11 11:52:04 +01:00
|
|
|
}
|
|
|
|
((EntityPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-2867
|
|
|
|
enuminteractionresult = (event.useItemInHand() != Event.Result.ALLOW) ? EnumInteractionResult.SUCCESS : EnumInteractionResult.PASS;
|
|
|
|
--
|
2018-06-30 07:40:52 +02:00
|
|
|
2.18.0
|
2018-02-11 11:52:04 +01:00
|
|
|
|