Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@b72eafc Send block entities after destroy prediction (#8053)
PaperMC/Paper@b74c4d4 Warn on plugins accessing faraway chunks (#8208)
PaperMC/Paper@65f0b2e Add more needed BlockStateListPopulator Methods (#8021)
This commit is contained in:
BillyGalbreath
2022-07-30 08:03:52 -05:00
parent 723e3703b2
commit 513f3bbedf
17 changed files with 42 additions and 42 deletions

View File

@@ -748,10 +748,10 @@ index c685e0acb2559e7415c94790d8392f0ee997ecc6..ad14dbed67ca622f9c8e05164104fe9a
this.entityManager.saveAll();
} else {
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 8f0a979f7a902b0512cd2eacf769653a5471bc74..34bbbc110faa5f85c3258e0c614e067ec16bcc79 100644
index 85a0a342f6c007280e62f2b0f3c932e665debd6f..6a161743fd80c90c945499075e84aa981fbbd090 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2567,7 +2567,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2587,7 +2587,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
}
}
// Paper End
@@ -760,7 +760,7 @@ index 8f0a979f7a902b0512cd2eacf769653a5471bc74..34bbbc110faa5f85c3258e0c614e067e
if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
this.LOGGER.info(this.player.getScoreboardName() + " issued server command: " + s);
@@ -2577,7 +2577,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2597,7 +2597,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
this.cserver.getPluginManager().callEvent(event);
if (event.isCancelled()) {
@@ -769,7 +769,7 @@ index 8f0a979f7a902b0512cd2eacf769653a5471bc74..34bbbc110faa5f85c3258e0c614e067e
return;
}
@@ -2590,7 +2590,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2610,7 +2610,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 {
@@ -866,7 +866,7 @@ index 210b0cdd4831421c8f43c3d823ac8e962b56bbbc..de99946f5215ff2c78d6df5b8b7d5b6a
chunkcoordintpair.x, chunkcoordintpair.z, data, null, com.destroystokyo.paper.io.PrioritizedTaskQueue.NORMAL_PRIORITY);
}
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 0dab4ef279f7e9af64290395b4af205b0d54f271..d270d0f47d26085ce7912b61a66b922a95871a73 100644
index 824f3dfaf2ba6f064efaa7939b990023de1f1448..582613e9c45135b2cc0c02f457e5c3d61d138c86 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -994,15 +994,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {