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

@@ -52,10 +52,10 @@ index f61e0c8a12f2132b307b541525df729eda1a4f51..000007e77e73153d3d634a3ab5882916
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 0d428a9c6c8854a99f5f1a9860fe1a57c3fab392..94f042d8d3f15081e25f0cb938c01e3277918ac7 100644
index 824c12db04aaaa750de54fce8a15b386dec1cc08..01313fdd9d5a1909bfbcbf8f613030e7727f1c36 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2240,6 +2240,42 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -2260,6 +2260,42 @@ public class CraftWorld extends CraftRegionAccessor implements World {
public float getLocalDifficultyAt(Location location) {
return getHandle().getCurrentDifficultyAt(net.minecraft.server.MCUtil.toBlockPosition(location)).getEffectiveDifficulty();
}
@@ -99,7 +99,7 @@ index 0d428a9c6c8854a99f5f1a9860fe1a57c3fab392..94f042d8d3f15081e25f0cb938c01e32
// Paper start
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 753ef343b7daab339a4308935e3cec86e49481f0..92182c27b73e4841d2724b4286ddd21db65aea5c 100644
index 4d16fdee4a73f980c1dc0dfe9f9970d4f3c88190..56deaef79e42314117731c5a6ea0b1f5496435dd 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2963,5 +2963,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {