Skip to content

Commit d7165b0

Browse files
kennytvkennytv
committed
Fix some references to obfuscated code
1 parent 1ccff4f commit d7165b0

8 files changed

+23
-24
lines changed

‎patches/server/0008-Adventure.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2412,7 +2412,7 @@ index 7fa6212fca01af9efd787f2c74af986fbeef4a77..b403022201b34118adddf817b19a8bbd
24122412
@Override
24132413
public boolean isPermissionSet(String name) {
24142414
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
2415-
index 56151652fdeb98f54358cfefc3d8773c1a39fcf6..2099056896954c700840f3c598f147e4983b86a1 100644
2415+
index 56151652fdeb98f54358cfefc3d8773c1a39fcf6..2c934b7a2142a4d1ae21feeb95d23f22cfda3be0 100644
24162416
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
24172417
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
24182418
@@ -318,9 +318,12 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -2425,7 +2425,7 @@ index 56151652fdeb98f54358cfefc3d8773c1a39fcf6..2099056896954c700840f3c598f147e4
24252425
+ if (adventure$title == null) adventure$title = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(container.getBukkitView().getTitle()); // Paper
24262426

24272427
- player.connection.send(new ClientboundOpenScreenPacket(container.containerId, windowType, CraftChatMessage.fromString(title)[0]));
2428-
+ //player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(container.windowId, windowType, CraftChatMessage.fromString(title)[0])); // Paper // Paper - comment
2428+
+ //player.connection.send(new ClientboundOpenScreenPacket(container.containerId, windowType, CraftChatMessage.fromString(title)[0])); // Paper - comment
24292429
+ player.connection.send(new ClientboundOpenScreenPacket(container.containerId, windowType, io.papermc.paper.adventure.PaperAdventure.asVanilla(adventure$title))); // Paper
24302430
player.containerMenu = container;
24312431
player.initMenu(container);
@@ -2440,7 +2440,7 @@ index 56151652fdeb98f54358cfefc3d8773c1a39fcf6..2099056896954c700840f3c598f147e4
24402440
+ //String title = inventory.getTitle(); // Paper - comment
24412441
+ net.kyori.adventure.text.Component adventure$title = inventory.title(); // Paper
24422442
+ if (adventure$title == null) adventure$title = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(inventory.getTitle()); // Paper
2443-
+ //player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(container.windowId, windowType, CraftChatMessage.fromString(title)[0])); // Paper - comment
2443+
+ //player.connection.send(new ClientboundOpenScreenPacket(container.containerId, windowType, CraftChatMessage.fromString(title)[0])); // Paper - comment
24442444
+ player.connection.send(new ClientboundOpenScreenPacket(container.containerId, windowType, io.papermc.paper.adventure.PaperAdventure.asVanilla(adventure$title))); // Paper
24452445
player.containerMenu = container;
24462446
player.initMenu(container);

‎patches/server/0156-handle-PacketPlayInKeepAlive-async.patch‎ renamed to ‎patches/server/0156-handle-ServerboundKeepAlivePacket-async.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22
From: Shane Freeder <theboyetronic@gmail.com>
33
Date: Thu, 5 Oct 2017 01:54:07 +0100
4-
Subject: [PATCH] handle PacketPlayInKeepAlive async
4+
Subject: [PATCH] handle ServerboundKeepAlivePacket async
55

6-
In 1.12.2, Mojang moved the processing of PacketPlayInKeepAlive off the main
6+
In 1.12.2, Mojang moved the processing of ServerboundKeepAlivePacket off the main
77
thread, while entirely correct for the server, this causes issues with
88
plugins which are expecting the PlayerQuitEvent on the main thread.
99

@@ -15,15 +15,15 @@ also adding some additional logging in order to help work out what is causing
1515
random disconnections for clients.
1616

1717
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
18-
index c5ab3ee4525f8eb611f273ff35d1b91787bc95b8..32c59e612519323c8ee1956a1a893354913d1fda 100644
18+
index c5ab3ee4525f8eb611f273ff35d1b91787bc95b8..a38061ba575a2603b6b04382cb2f5c8396b05bdd 100644
1919
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
2020
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
2121
@@ -2996,14 +2996,18 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
2222

2323
@Override
2424
public void handleKeepAlive(ServerboundKeepAlivePacket packet) {
2525
- PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel()); // CraftBukkit
26-
+ //PlayerConnectionUtils.ensureMainThread(packetplayinkeepalive, this, this.player.getWorldServer()); // CraftBukkit // Paper - This shouldn't be on the main thread
26+
+ //PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel()); // CraftBukkit // Paper - This shouldn't be on the main thread
2727
if (this.keepAlivePending && packet.getId() == this.keepAliveChallenge) {
2828
int i = (int) (Util.getMillis() - this.keepAliveTime);
2929

‎patches/server/0165-AsyncTabCompleteEvent.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ completion, such as offline players.
1414
Also adds isCommand and getLocation to the sync TabCompleteEvent
1515

1616
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
17-
index 71e52f71ac06f66696f5ae9b79ab490c7389927f..cd9f1bea29833c0d263d43f4a8c76908c0c54b89 100644
17+
index 86f9991cfe6aca5923c64d8cdde6e90b9ba5591d..7f17875e359855a25618a52bc2e844fe10258aaf 100644
1818
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
1919
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
2020
@@ -741,10 +741,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
2121

2222
@Override
2323
public void handleCustomCommandSuggestions(ServerboundCommandSuggestionPacket packet) {
2424
- PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
25-
+ // PlayerConnectionUtils.ensureMainThread(packetplayintabcomplete, this, this.player.getWorldServer()); // Paper - run this async
25+
+ // PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel()); // Paper - run this async
2626
// CraftBukkit start
2727
if (this.chatSpamTickCount.addAndGet(1) > 500 && !this.server.getPlayerList().isOp(this.player.getGameProfile())) {
2828
- this.disconnect(Component.translatable("disconnect.spam"));
@@ -72,7 +72,7 @@ index 71e52f71ac06f66696f5ae9b79ab490c7389927f..cd9f1bea29833c0d263d43f4a8c76908
7272

7373
@Override
7474
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
75-
index eed64dedb3430bd01c53c230c280a7c475fdbfd5..3f84c3579b1b37f98120d20bae008a1030b93adf 100644
75+
index e674b45ee77480cd3c1da86b6f32a3ff2edd865f..c699d1eecac2b3f87f89b2e801ab909f863233b2 100644
7676
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
7777
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
7878
@@ -2060,7 +2060,7 @@ public final class CraftServer implements Server {

‎patches/server/0214-InventoryCloseEvent-Reason-API.patch‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ index 05b9595d4d308e5b4a551d26f3defbfa1d829ea9..0ef0b7fa2af5ac6608f9b8b37317434f
7575
this.doCloseContainer();
7676
}
7777
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
78-
index 2d6bb5e7dee7a0e7ddaf6e05a9a1f9df9f1d195d..c91e8300fe0cb673567f0b0e725a6d460dcebf31 100644
78+
index d729042a22f01decbf30d35d7842e43cab283c05..8b9e569ccefaa5123c966590a9bba77cc8eec64d 100644
7979
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
8080
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
8181
@@ -204,6 +204,7 @@ import org.bukkit.event.inventory.ClickType;
@@ -90,13 +90,12 @@ index 2d6bb5e7dee7a0e7ddaf6e05a9a1f9df9f1d195d..c91e8300fe0cb673567f0b0e725a6d46
9090

9191
@Override
9292
public void handleContainerClose(ServerboundContainerClosePacket packet) {
93-
- PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
9493
+ // Paper start
9594
+ handleContainerClose(packet, InventoryCloseEvent.Reason.PLAYER);
9695
+ }
97-
+ public void handleContainerClose(ServerboundContainerClosePacket packetplayinclosewindow, InventoryCloseEvent.Reason reason) {
96+
+ public void handleContainerClose(ServerboundContainerClosePacket packet, InventoryCloseEvent.Reason reason) {
9897
+ // Paper end
99-
+ PacketUtils.ensureRunningOnSameThread(packetplayinclosewindow, this, this.player.getLevel());
98+
PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
10099

101100
if (this.player.isImmobile()) return; // CraftBukkit
102101
- CraftEventFactory.handleInventoryCloseEvent(this.player); // CraftBukkit
@@ -145,7 +144,7 @@ index f484bdf2ef045faefad326f8e6d59962b3abb4b3..9dad71368225d86598f02962b42659bc
145144
this.containerMenu = this.inventoryMenu;
146145
}
147146
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
148-
index 34e8ee0cc42c77715c62b0b4682f3df946266e11..6abac92f929f3260e62a78b0ee1887b109b0cc25 100644
147+
index 4ff81744b7c9113f57cf1fa89bb943902711b2dc..404ed5e8f54d70a50de4232c6ea0f6163b34c2ab 100644
149148
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
150149
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
151150
@@ -374,7 +374,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {

‎patches/server/0233-Break-up-and-make-tab-spam-limits-configurable.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ to take the burden of this into their own hand without having to rely on
2222
plugins doing unsafe things.
2323

2424
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
25-
index 4b99de786be5fbefb94a5484868b897ab0f86a27..e0215f34f5f82cbd3a67f58a8a177fc886ccc72c 100644
25+
index ff79bb6e51d8c7e4b61509f7cf95b1282e7a844e..14b102e8341d4cb10935e9d247d7451661a02017 100644
2626
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
2727
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
2828
@@ -246,6 +246,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -43,7 +43,7 @@ index 4b99de786be5fbefb94a5484868b897ab0f86a27..e0215f34f5f82cbd3a67f58a8a177fc8
4343
--this.chatSpamTickCount;
4444
@@ -744,7 +746,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
4545
public void handleCustomCommandSuggestions(ServerboundCommandSuggestionPacket packet) {
46-
// PlayerConnectionUtils.ensureMainThread(packetplayintabcomplete, this, this.player.getWorldServer()); // Paper - run this async
46+
// PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel()); // Paper - run this async
4747
// CraftBukkit start
4848
- if (this.chatSpamTickCount.addAndGet(1) > 500 && !this.server.getPlayerList().isOp(this.player.getGameProfile())) {
4949
+ if (this.chatSpamTickCount.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamLimit && !this.server.getPlayerList().isOp(this.player.getGameProfile())) { // Paper start - split and make configurable

‎patches/server/0388-Prevent-opening-inventories-when-frozen.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ index 3933387e180acc0fcbff1c1147fcf73eeaa8b0d7..02a84c3f3ca6b591a1c475b5cf3357ce
2727
this.initMenu(container);
2828
return OptionalInt.of(this.containerCounter);
2929
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
30-
index 6abac92f929f3260e62a78b0ee1887b109b0cc25..9d6c3cb06cf1096fc9bffe5123bf19df13fdded6 100644
30+
index 404ed5e8f54d70a50de4232c6ea0f6163b34c2ab..3866c466fcc40f17f88063acb939f9091708a92f 100644
3131
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
3232
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
3333
@@ -323,7 +323,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
3434
if (adventure$title == null) adventure$title = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(container.getBukkitView().getTitle()); // Paper
3535

36-
//player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(container.windowId, windowType, CraftChatMessage.fromString(title)[0])); // Paper // Paper - comment
36+
//player.connection.send(new ClientboundOpenScreenPacket(container.containerId, windowType, CraftChatMessage.fromString(title)[0])); // Paper - comment
3737
- player.connection.send(new ClientboundOpenScreenPacket(container.containerId, windowType, io.papermc.paper.adventure.PaperAdventure.asVanilla(adventure$title))); // Paper
3838
+ if (!player.isImmobile()) player.connection.send(new ClientboundOpenScreenPacket(container.containerId, windowType, io.papermc.paper.adventure.PaperAdventure.asVanilla(adventure$title))); // Paper
3939
player.containerMenu = container;
@@ -42,7 +42,7 @@ index 6abac92f929f3260e62a78b0ee1887b109b0cc25..9d6c3cb06cf1096fc9bffe5123bf19df
4242
@@ -397,7 +397,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
4343
net.kyori.adventure.text.Component adventure$title = inventory.title(); // Paper
4444
if (adventure$title == null) adventure$title = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(inventory.getTitle()); // Paper
45-
//player.playerConnection.sendPacket(new PacketPlayOutOpenWindow(container.windowId, windowType, CraftChatMessage.fromString(title)[0])); // Paper - comment
45+
//player.connection.send(new ClientboundOpenScreenPacket(container.containerId, windowType, CraftChatMessage.fromString(title)[0])); // Paper - comment
4646
- player.connection.send(new ClientboundOpenScreenPacket(container.containerId, windowType, io.papermc.paper.adventure.PaperAdventure.asVanilla(adventure$title))); // Paper
4747
+ if (!player.isImmobile()) player.connection.send(new ClientboundOpenScreenPacket(container.containerId, windowType, io.papermc.paper.adventure.PaperAdventure.asVanilla(adventure$title))); // Paper
4848
player.containerMenu = container;

‎patches/server/0543-MC-4-Fix-item-position-desync.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ index 3768a71491ef7836b9739bdaec7a077c523dbacd..a57957ace1a72b3308487f180a366c38
2727

2828
public Vec3 decode(long x, long y, long z) {
2929
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
30-
index 6b49e66f0e45eb7ed525fe4314d2a9615212f7e4..4f9a5837d66c1940385e94f80d865cde1c4cf2a2 100644
30+
index 6b49e66f0e45eb7ed525fe4314d2a9615212f7e4..b537edf3c219f5064733eec53082db577be51f81 100644
3131
--- a/src/main/java/net/minecraft/world/entity/Entity.java
3232
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
3333
@@ -3888,6 +3888,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -37,7 +37,7 @@ index 6b49e66f0e45eb7ed525fe4314d2a9615212f7e4..4f9a5837d66c1940385e94f80d865cde
3737
+ // Paper start - fix MC-4
3838
+ if (this instanceof ItemEntity) {
3939
+ if (io.papermc.paper.configuration.GlobalConfiguration.get().misc.fixEntityPositionDesync) {
40-
+ // encode/decode from PacketPlayOutEntity
40+
+ // encode/decode from ClientboundMoveEntityPacket
4141
+ x = Mth.lfloor(x * 4096.0D) * (1 / 4096.0D);
4242
+ y = Mth.lfloor(y * 4096.0D) * (1 / 4096.0D);
4343
+ z = Mth.lfloor(z * 4096.0D) * (1 / 4096.0D);

‎patches/server/0655-Add-PlayerKickEvent-causes.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ index 65637a33ba171a4b598f70cd943d24b0ee44a69f..57a9146bf2dee7a60aab16716e25348f
5757
}
5858

5959
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
60-
index b5b130785cb0009f58b65b1cc4dba9f006ba1d7a..4e356271ba54d51c4778314c86495136bfbd8704 100644
60+
index f3a8b36956dbb8b9396bac4fc17aae7a3cb1d594..c8e99e115c0c40834cc73c8373bb757ea7e1e88f 100644
6161
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
6262
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
6363
@@ -344,7 +344,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -141,7 +141,7 @@ index b5b130785cb0009f58b65b1cc4dba9f006ba1d7a..4e356271ba54d51c4778314c86495136
141141
Entity entity = this.player.getRootVehicle();
142142

143143
@@ -784,13 +792,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
144-
// PlayerConnectionUtils.ensureMainThread(packetplayintabcomplete, this, this.player.getWorldServer()); // Paper - run this async
144+
// PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel()); // Paper - run this async
145145
// CraftBukkit start
146146
if (this.chatSpamTickCount.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamLimit && !this.server.getPlayerList().isOp(this.player.getGameProfile())) { // Paper start - split and make configurable
147147
- server.scheduleOnMain(() -> this.disconnect(Component.translatable("disconnect.spam", new Object[0]))); // Paper

0 commit comments

Comments
 (0)