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

@@ -4850,7 +4850,7 @@ index 468c635d31cfa8051666bbefce8df4b448e9ed93..17e869074b8cf29a8c3280499a27e951
final String id;
private final GameRules.Category category;
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 5a2a1d394852d39ea576624586f7fa736dec807c..0681a7499755b573c191804b38ac8783eb7d0f32 100644
index ceb1f18ec16ddcda792ef0393b5f4649fbef3017..388a153113d87ba99515828c6d535110b4413c7c 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -271,6 +271,17 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -4977,7 +4977,7 @@ index 5a2a1d394852d39ea576624586f7fa736dec807c..0681a7499755b573c191804b38ac8783
public boolean isInWorldBounds(BlockPos pos) {
return pos.isInsideBuildHeightAndWorldBoundsHorizontal(this); // Paper - use better/optimized check
}
@@ -896,13 +999,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -897,13 +1000,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
try {
tickConsumer.accept(entity);
MinecraftServer.getServer().executeMidTickTasks(); // Paper - execute chunk tasks mid tick
@@ -4993,7 +4993,7 @@ index 5a2a1d394852d39ea576624586f7fa736dec807c..0681a7499755b573c191804b38ac8783
// Paper end
}
}
@@ -1388,6 +1491,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1389,6 +1492,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
}
public ProfilerFiller getProfiler() {