mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updated Upstream (Bukkit/CraftBukkit) (#7022)

Browse source
This commit is contained in:
Jake Potrebic 2021-12-04 23:11:59 -08:00 • committed by GitHub
parent a8e5141f2a
commit fd352861b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
69 changed files with 281 additions and 247 deletions
Download patch file Download diff file Expand all files Collapse all files

6
patches/server/0056-Add-exception-reporting-event.patch
View file

@ -151,7 +151,7 @@ index 81b61b6cc1e99328d4d339ca32895d1268c88ca7..28a7c53d98450cc79bee953411a18f50
}
diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
index 8dda77880d42cf1b648324d945eb065681b59c33..049a2496e89a879c5b46f1e23d945a7c9461bafc 100644
index 9638e28077b5720745f6125805fbda702a804f74..d207e54019360f7f94bfa5301462fe3c8ac6758e 100644
--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
@@ -1,6 +1,7 @@
@ -162,7 +162,7 @@ index 8dda77880d42cf1b648324d945eb065681b59c33..049a2496e89a879c5b46f1e23d945a7c
import com.google.common.collect.Maps;
import com.google.common.collect.UnmodifiableIterator;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
@@ -550,10 +551,15 @@ public class LevelChunk extends ChunkAccess {
@@ -549,10 +550,15 @@ public class LevelChunk extends ChunkAccess {
this.removeBlockEntity(blockEntity.getBlockPos());
// Paper end
} else {
@ -182,7 +182,7 @@ index 8dda77880d42cf1b648324d945eb065681b59c33..049a2496e89a879c5b46f1e23d945a7c
// CraftBukkit end
}
}
@@ -1035,6 +1041,7 @@ public class LevelChunk extends ChunkAccess {
@@ -1034,6 +1040,7 @@ public class LevelChunk extends ChunkAccess {
// Paper start - Prevent tile entity and entity crashes
final String msg = String.format("BlockEntity threw exception at %s:%s,%s,%s", LevelChunk.this.getLevel().getWorld().getName(), this.getPos().getX(), this.getPos().getY(), this.getPos().getZ());
net.minecraft.server.MinecraftServer.LOGGER.error(msg, throwable);