core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0443-Prevent-opening-invent...

60 lines
3.8 KiB
Diff
Raw Normal View History

Rebuild all patches using the new rebuild pattern
2020-05-06 09:48:49 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
Prevent opening inventories when frozen
2020-04-13 06:33:46 +00:00
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 13 Apr 2020 07:31:44 +0100
Subject: [PATCH] Prevent opening inventories when frozen
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#4728) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 30885166 Update to Minecraft 1.16.4 CraftBukkit Changes: 3af81c71 Update to Minecraft 1.16.4 Spigot Changes: f011ca24 Update to Minecraft 1.16.4 Co-authored-by: Mariell Hoversholm <proximyst@proximyst.com>
2020-11-03 02:22:15 +00:00
index a46f8573467f8a64a76532237072094460491938..7a791f5ea0ecb98f8b4509f79538d3f1e55703f6 100644
Prevent opening inventories when frozen
2020-04-13 06:33:46 +00:00
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#4728) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 30885166 Update to Minecraft 1.16.4 CraftBukkit Changes: 3af81c71 Update to Minecraft 1.16.4 Spigot Changes: f011ca24 Update to Minecraft 1.16.4 Co-authored-by: Mariell Hoversholm <proximyst@proximyst.com>
2020-11-03 02:22:15 +00:00
@@ -427,7 +427,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
Improve blocking players from opening inventories while sleeping This is friendlier to plugins as far as the plugin is concerned, the inventory did open and immediately closed. We avoid sending the packet to client so they don't see the window flash either. If a plugin wants to avoid wasteful fake opens, they should check that the player is not sleeping before opening the inventory.
2020-04-26 07:26:21 +00:00
containerUpdateDelay = world.paperConfig.containerUpdateTickRate;
}
// Paper end
- if (!this.world.isClientSide && !this.activeContainer.canUse(this)) {
+ if (!this.world.isClientSide && this.activeContainer != this.defaultContainer && (isFrozen() || !this.activeContainer.canUse(this))) { // Paper - auto close while frozen
this.closeInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason.CANT_USE); // Paper
this.activeContainer = this.defaultContainer;
}
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#4728) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 30885166 Update to Minecraft 1.16.4 CraftBukkit Changes: 3af81c71 Update to Minecraft 1.16.4 Spigot Changes: f011ca24 Update to Minecraft 1.16.4 Co-authored-by: Mariell Hoversholm <proximyst@proximyst.com>
2020-11-03 02:22:15 +00:00
@@ -1255,7 +1255,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
Improve blocking players from opening inventories while sleeping This is friendlier to plugins as far as the plugin is concerned, the inventory did open and immediately closed. We avoid sending the packet to client so they don't see the window flash either. If a plugin wants to avoid wasteful fake opens, they should check that the player is not sleeping before opening the inventory.
2020-04-26 07:26:21 +00:00
} else {
// CraftBukkit start
this.activeContainer = container;
- this.playerConnection.sendPacket(new PacketPlayOutOpenWindow(container.windowId, container.getType(), container.getTitle()));
+ if (!isFrozen()) this.playerConnection.sendPacket(new PacketPlayOutOpenWindow(container.windowId, container.getType(), container.getTitle())); // Paper
// CraftBukkit end
container.addSlotListener(this);
return OptionalInt.of(this.containerCounter);
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#4728) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 30885166 Update to Minecraft 1.16.4 CraftBukkit Changes: 3af81c71 Update to Minecraft 1.16.4 Spigot Changes: f011ca24 Update to Minecraft 1.16.4 Co-authored-by: Mariell Hoversholm <proximyst@proximyst.com>
2020-11-03 02:22:15 +00:00
@@ -2051,7 +2051,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
Prevent opening inventories when frozen
2020-04-13 06:33:46 +00:00
}
@Override
- protected boolean isFrozen() {
+ public boolean isFrozen() { // Paper - protected > public
return super.isFrozen() || (this.playerConnection != null && this.playerConnection.isDisconnected()); // Paper
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 565a5727 #533: Add consumed item, hand and consumeItem boolean to EntityShootBowEvent CraftBukkit Changes: 927200a9 #718: Add consumed item, hand and consumeItem boolean to EntityShootBowEvent
2020-08-31 12:30:51 +00:00
index ebcd2d043b3e6cf90b62eda1ea7a2d8c01f1c7a8..c3a51843a58138270bd24e51b5bead2c43e2cbe3 100644
Prevent opening inventories when frozen
2020-04-13 06:33:46 +00:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
[Auto] Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 1cb03826 SPIGOT-5900: Re-order Material enum entries to match Minecraft's order fdd705db #507: Add hasDiscoveredRecipe() and getDiscoveredRecipes() CraftBukkit Changes: 551e770f5 SPIGOT-5900: Add test for the order of Material enum entries 8297676c2 #682: Add hasDiscoveredRecipe() and getDiscoveredRecipes()
2020-07-01 23:41:58 +00:00
@@ -319,7 +319,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
Prevent opening inventories when frozen
2020-04-13 06:33:46 +00:00
Improve blocking players from opening inventories while sleeping This is friendlier to plugins as far as the plugin is concerned, the inventory did open and immediately closed. We avoid sending the packet to client so they don't see the window flash either. If a plugin wants to avoid wasteful fake opens, they should check that the player is not sleeping before opening the inventory.
2020-04-26 07:26:21 +00:00
String title = container.getBukkitView().getTitle();
Current non compilable status of all patches - THIS IS NOT READY THERE IS STILL NO ETA. GOBLINS WILL EAT YOU.
2020-06-26 01:58:00 +00:00
- player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(container.windowId, windowType, CraftChatMessage.fromString(title)[0]));
+ if (!player.isFrozen()) player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(container.windowId, windowType, CraftChatMessage.fromString(title)[0])); // Paper
Improve blocking players from opening inventories while sleeping This is friendlier to plugins as far as the plugin is concerned, the inventory did open and immediately closed. We avoid sending the packet to client so they don't see the window flash either. If a plugin wants to avoid wasteful fake opens, they should check that the player is not sleeping before opening the inventory.
2020-04-26 07:26:21 +00:00
getHandle().activeContainer = container;
getHandle().activeContainer.addSlotListener(player);
}
[Auto] Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 1cb03826 SPIGOT-5900: Re-order Material enum entries to match Minecraft's order fdd705db #507: Add hasDiscoveredRecipe() and getDiscoveredRecipes() CraftBukkit Changes: 551e770f5 SPIGOT-5900: Add test for the order of Material enum entries 8297676c2 #682: Add hasDiscoveredRecipe() and getDiscoveredRecipes()
2020-07-01 23:41:58 +00:00
@@ -389,7 +389,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
Improve blocking players from opening inventories while sleeping This is friendlier to plugins as far as the plugin is concerned, the inventory did open and immediately closed. We avoid sending the packet to client so they don't see the window flash either. If a plugin wants to avoid wasteful fake opens, they should check that the player is not sleeping before opening the inventory.
2020-04-26 07:26:21 +00:00
// Now open the window
Containers<?> windowType = CraftContainer.getNotchInventoryType(inventory.getTopInventory());
String title = inventory.getTitle();
Current non compilable status of all patches - THIS IS NOT READY THERE IS STILL NO ETA. GOBLINS WILL EAT YOU.
2020-06-26 01:58:00 +00:00
- player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(container.windowId, windowType, CraftChatMessage.fromString(title)[0]));
+ if (!player.isFrozen()) player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(container.windowId, windowType, CraftChatMessage.fromString(title)[0])); // Paper
Improve blocking players from opening inventories while sleeping This is friendlier to plugins as far as the plugin is concerned, the inventory did open and immediately closed. We avoid sending the packet to client so they don't see the window flash either. If a plugin wants to avoid wasteful fake opens, they should check that the player is not sleeping before opening the inventory.
2020-04-26 07:26:21 +00:00
player.activeContainer = container;
player.activeContainer.addSlotListener(player);
}