2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Tue, 1 Mar 2016 23:52:34 -0600
|
|
|
|
Subject: [PATCH] Prevent tile entity and entity crashes
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
|
2023-12-05 18:20:55 +01:00
|
|
|
index 1e57df43ea47f18cc151dc8ad5fd6f18d3615462..bace136d8d62a85c5de5ca9a516d4712ddd3db99 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/level/Level.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/Level.java
|
2023-09-22 22:13:57 +02:00
|
|
|
@@ -728,11 +728,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
|
2021-06-11 14:02:28 +02:00
|
|
|
try {
|
|
|
|
tickConsumer.accept(entity);
|
|
|
|
} catch (Throwable throwable) {
|
|
|
|
- CrashReport crashreport = CrashReport.forThrowable(throwable, "Ticking entity");
|
|
|
|
- CrashReportCategory crashreportsystemdetails = crashreport.addCategory("Entity being ticked");
|
|
|
|
-
|
|
|
|
- entity.fillCrashReportCategory(crashreportsystemdetails);
|
|
|
|
- throw new ReportedException(crashreport);
|
|
|
|
+ // Paper start - Prevent tile entity and entity crashes
|
2023-06-07 23:46:56 +02:00
|
|
|
+ final String msg = String.format("Entity threw exception at %s:%s,%s,%s", entity.level().getWorld().getName(), entity.getX(), entity.getY(), entity.getZ());
|
2021-06-21 10:09:18 +02:00
|
|
|
+ MinecraftServer.LOGGER.error(msg, throwable);
|
2021-06-12 00:37:16 +02:00
|
|
|
+ entity.discard();
|
2021-06-11 14:02:28 +02:00
|
|
|
+ // Paper end
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
|
2022-12-07 19:32:25 +01:00
|
|
|
index b300d12e9e00519028b53aca9c3fb01f589eaa91..63acd109a79ed752a05df3d4f1b99309297c2055 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
|
2022-03-30 22:28:38 +02:00
|
|
|
@@ -213,7 +213,12 @@ public abstract class BlockEntity {
|
2021-06-12 00:37:16 +02:00
|
|
|
return minecraftkey + " // " + this.getClass().getCanonicalName();
|
2021-06-11 14:02:28 +02:00
|
|
|
});
|
|
|
|
if (this.level != null) {
|
2021-06-12 00:37:16 +02:00
|
|
|
- CrashReportCategory.populateBlockDetails(crashReportSection, this.level, this.worldPosition, this.getBlockState());
|
2021-06-11 14:02:28 +02:00
|
|
|
+ // Paper start - Prevent TileEntity and Entity crashes
|
|
|
|
+ BlockState block = this.getBlockState();
|
|
|
|
+ if (block != null) {
|
2021-06-12 00:37:16 +02:00
|
|
|
+ CrashReportCategory.populateBlockDetails(crashReportSection, this.level, this.worldPosition, block);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+ // Paper end
|
2021-06-12 00:37:16 +02:00
|
|
|
CrashReportCategory.populateBlockDetails(crashReportSection, this.level, this.worldPosition, this.level.getBlockState(this.worldPosition));
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
}
|
2021-06-12 00:37:16 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
|
2023-12-05 18:20:55 +01:00
|
|
|
index c2663fadd2c714b25fe411777ca9be957c3545df..86bcebd778e5d51e1029b96048145622cd2811f3 100644
|
2021-06-12 00:37:16 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
|
2023-10-17 03:57:45 +02:00
|
|
|
@@ -1143,11 +1143,11 @@ public class LevelChunk extends ChunkAccess {
|
2021-06-12 00:37:16 +02:00
|
|
|
|
|
|
|
gameprofilerfiller.pop();
|
|
|
|
} catch (Throwable throwable) {
|
|
|
|
- CrashReport crashreport = CrashReport.forThrowable(throwable, "Ticking block entity");
|
|
|
|
- CrashReportCategory crashreportsystemdetails = crashreport.addCategory("Block entity being ticked");
|
|
|
|
-
|
|
|
|
- this.blockEntity.fillCrashReportCategory(crashreportsystemdetails);
|
|
|
|
- throw new ReportedException(crashreport);
|
|
|
|
+ // Paper start - Prevent tile entity and entity crashes
|
2021-06-21 10:09:18 +02:00
|
|
|
+ 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);
|
2021-06-12 00:37:16 +02:00
|
|
|
+ LevelChunk.this.removeBlockEntity(this.getPos());
|
|
|
|
+ // Paper end
|
|
|
|
// Spigot start
|
|
|
|
} finally {
|
|
|
|
this.blockEntity.tickTimer.stopTiming();
|