diff options
| author | Aikar <[email protected]> | 2020-09-03 16:52:21 -0400 |
|---|---|---|
| committer | Aikar <[email protected]> | 2020-09-03 16:52:21 -0400 |
| commit | 0fb3daf4f6957d2d454104e9654b0ad46a6f0442 (patch) | |
| tree | 2b3057eaa401b92261009f2cc2225b8f4571ce94 /Spigot-Server-Patches/0009-Timings-v2.patch | |
| parent | 819ff324354b61a2656fa0d8129275475478ccc1 (diff) | |
| download | Paper-0fb3daf4f6957d2d454104e9654b0ad46a6f0442.tar.gz Paper-0fb3daf4f6957d2d454104e9654b0ad46a6f0442.zip | |
[Auto] Updated Upstream (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
CraftBukkit Changes:
a05df28a7 SPIGOT-6122: Revert "SPIGOT-5794: Do not skip PlayerInteractEvent"
Diffstat (limited to 'Spigot-Server-Patches/0009-Timings-v2.patch')
| -rw-r--r-- | Spigot-Server-Patches/0009-Timings-v2.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch index 631a54c6c7..bdd402a61f 100644 --- a/Spigot-Server-Patches/0009-Timings-v2.patch +++ b/Spigot-Server-Patches/0009-Timings-v2.patch @@ -1409,7 +1409,7 @@ index 127c03c321e1414e0d174c8d81a7851c9da03574..d98b6ef44e1836920956754dfcb6654f protected void broadcast(Entity entity, Packet<?> packet) { diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 81a99c156c7f626964c3e93491d8bd1d6647e960..46a4fc3140cd805794dfbc8456a7cb98c0004752 100644 +index c7a7e2cf54b4ca7fd65fca63c0f102f479a0f3e5..89c36a5ad2a74a2bf4c86ad108a43e97fa88e793 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -58,6 +58,7 @@ import org.bukkit.inventory.CraftingInventory; @@ -1436,7 +1436,7 @@ index 81a99c156c7f626964c3e93491d8bd1d6647e960..46a4fc3140cd805794dfbc8456a7cb98 } -@@ -1673,7 +1672,7 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -1678,7 +1677,7 @@ public class PlayerConnection implements PacketListenerPlayIn { // CraftBukkit end private void handleCommand(String s) { @@ -1445,7 +1445,7 @@ index 81a99c156c7f626964c3e93491d8bd1d6647e960..46a4fc3140cd805794dfbc8456a7cb98 // CraftBukkit start - whole method if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot this.LOGGER.info(this.player.getName() + " issued server command: " + s); -@@ -1684,7 +1683,7 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -1689,7 +1688,7 @@ public class PlayerConnection implements PacketListenerPlayIn { this.server.getPluginManager().callEvent(event); if (event.isCancelled()) { @@ -1454,7 +1454,7 @@ index 81a99c156c7f626964c3e93491d8bd1d6647e960..46a4fc3140cd805794dfbc8456a7cb98 return; } -@@ -1697,7 +1696,7 @@ public class PlayerConnection implements PacketListenerPlayIn { +@@ -1702,7 +1701,7 @@ public class PlayerConnection implements PacketListenerPlayIn { java.util.logging.Logger.getLogger(PlayerConnection.class.getName()).log(java.util.logging.Level.SEVERE, null, ex); return; } finally { |