Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@4f9575e Break redstone on top of trap doors early
PaperMC/Paper@83da4b6 Fix DamageSource for Falling Blocks (#9175)
PaperMC/Paper@9846d0d Fix some NPE for EntityCompostItemEvent (#9169)
PaperMC/Paper@813d039 Make sure the player didn't disconnect when processing commands
PaperMC/Paper@1d4c780 Fix BlockPosition#offset(double,double,double) (#9190)
This commit is contained in:
granny
2023-05-07 22:32:23 -07:00
parent 21411de358
commit 54656e9755
11 changed files with 39 additions and 39 deletions

View File

@@ -629,10 +629,10 @@ index 3bf150a5f9ce1d497bf80174b80eca82c5fe06b5..2b82da383452b290ae99197c743e9a6e
} 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 81492eb04dd77f0ff8c29cb27663ffff01f40bb5..003e50f2d70ebf4e060a41675cb2f1fcea46f32d 100644
index cc04c5904547a678d507d4f6f9f3a0534370c546..5437ed9eb36c872792f19f028af3acf9522f0dc5 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2582,7 +2582,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2583,7 +2583,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
}
}
// Paper End
@@ -641,7 +641,7 @@ index 81492eb04dd77f0ff8c29cb27663ffff01f40bb5..003e50f2d70ebf4e060a41675cb2f1fc
if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
this.LOGGER.info(this.player.getScoreboardName() + " issued server command: " + s);
@@ -2592,7 +2592,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2593,7 +2593,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
this.cserver.getPluginManager().callEvent(event);
if (event.isCancelled()) {
@@ -650,7 +650,7 @@ index 81492eb04dd77f0ff8c29cb27663ffff01f40bb5..003e50f2d70ebf4e060a41675cb2f1fc
return;
}
@@ -2605,7 +2605,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2606,7 +2606,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 {