Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@046466f Re-arrange most chunk system patches to front (#8338)
PaperMC/Paper@e8c2c3b Fix World#refreshChunk not working for chunks in no-tick range
This commit is contained in:
BillyGalbreath
2022-09-01 21:51:05 -05:00
parent be681220d6
commit ff8e329e9d
29 changed files with 160 additions and 161 deletions

View File

@@ -108,10 +108,10 @@ index 575839fb7bd54d6a34cf8bfa59cf1086eaf22834..8d13fad0bd574cf9cd01d7aa5754023a
this.cserver.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(this.getCraftPlayer(), packStatus)); // CraftBukkit
// Paper end
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 3fd73a7fe1ac10edeb3e688149820682e7f20f7b..3c2f5ab8f566dadcc16d63eec754f057bca7444c 100644
index 0c05466b1265a22009781d469f8d324e3d42e0d3..dae6334ad480bc6323fa47421a22598e58e56684 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1017,6 +1017,8 @@ public abstract class PlayerList {
@@ -1014,6 +1014,8 @@ public abstract class PlayerList {
}
// Paper end
@@ -121,10 +121,10 @@ index 3fd73a7fe1ac10edeb3e688149820682e7f20f7b..3c2f5ab8f566dadcc16d63eec754f057
return entityplayer1;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index c57264e4f4284550d674a9c4083cc9cfbeb355bb..28ee76ac0df38787274a0c2e84738ece7537f5be 100644
index ba474fb6992c4427c8819a1ba4f3b692545e0957..d206dacbfe0f8b7b5eeaf23a855d95e721dcaecd 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2923,5 +2923,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2913,5 +2913,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetLastActionTime();
}