Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@36a5f15 Allow preventing BlockDestroyEvent from dropping items (#8349)
This commit is contained in:
BillyGalbreath
2022-09-09 12:32:30 -05:00
parent 6dc65d28c6
commit 5f14c32a66
5 changed files with 16 additions and 16 deletions

View File

@@ -887,10 +887,10 @@ 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 824f3dfaf2ba6f064efaa7939b990023de1f1448..582613e9c45135b2cc0c02f457e5c3d61d138c86 100644
index c5dac52a23d9df26cacb869fd841da9bf518c313..bd89e00f707b6ba297081c9aacb3c5463e80063e 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 {
@@ -995,15 +995,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
ProfilerFiller gameprofilerfiller = this.getProfiler();
gameprofilerfiller.push("blockEntities");
@@ -909,7 +909,7 @@ index 824f3dfaf2ba6f064efaa7939b990023de1f1448..582613e9c45135b2cc0c02f457e5c3d6
// Spigot start
// Iterator iterator = this.blockEntityTickers.iterator();
int tilesThisCycle = 0;
@@ -1035,7 +1035,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1036,7 +1036,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
}
this.blockEntityTickers.removeAll(toRemove);