Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@bf92f3e Updated Upstream (Bukkit/CraftBukkit)
This commit is contained in:
granny
2023-03-30 19:50:33 -07:00
parent 7f4822d6b6
commit 7cb1f466d1
10 changed files with 22 additions and 22 deletions

View File

@@ -650,10 +650,10 @@ index e0951fd02868f04bb12afab15b73b6d41e814abd..74ab15db63acae728a55ad2cde40ae9b
} else if (close) { chunkproviderserver.close(false); } // Paper - rewrite chunk system
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 355bd13f6d15ca1c94f56868b23d19f8bd0b0e1e..9cfe9f137a20a15af87d48fef0f7ee48400026ac 100644
index 82ecca48fdb1bffc87ec21b569725d87fbfb7325..517b70c1c421d48de775d92c4383e40a48fd53a8 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2572,7 +2572,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2573,7 +2573,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
}
}
// Paper End
@@ -662,7 +662,7 @@ index 355bd13f6d15ca1c94f56868b23d19f8bd0b0e1e..9cfe9f137a20a15af87d48fef0f7ee48
if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
this.LOGGER.info(this.player.getScoreboardName() + " issued server command: " + s);
@@ -2582,7 +2582,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2583,7 +2583,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
this.cserver.getPluginManager().callEvent(event);
if (event.isCancelled()) {
@@ -671,7 +671,7 @@ index 355bd13f6d15ca1c94f56868b23d19f8bd0b0e1e..9cfe9f137a20a15af87d48fef0f7ee48
return;
}
@@ -2595,7 +2595,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2596,7 +2596,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
java.util.logging.Logger.getLogger(ServerGamePacketListenerImpl.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
return;
} finally {