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
|
2021-11-24 23:26:32 +01:00
|
|
|
index 03c667b08db332f33b6da4e386c22d1a69c4f9a7..8a2d18524e089cdc07125e424b37f1b629e591a6 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
|
2021-11-24 19:46:06 +01:00
|
|
|
@@ -738,11 +738,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
|
2021-06-21 10:09:18 +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());
|
|
|
|
+ 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
|
2021-11-24 23:26:32 +01:00
|
|
|
index 53830d4f51365973092194ab38344ad13e84470a..a1bfe449cc2a9155ac1b8e68882e630cd75b1555 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
|
2021-11-23 13:15:10 +01:00
|
|
|
@@ -233,7 +233,12 @@ public abstract class BlockEntity implements io.papermc.paper.util.KeyedObject {
|
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
|
2021-11-24 23:26:32 +01:00
|
|
|
index fc6324aae881358dbf74caa70cd84ca5f566c701..5c77901cb6f3c9096b16f061a75341c2c9d466a9 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
|
2021-11-24 23:26:32 +01:00
|
|
|
@@ -1030,11 +1030,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();
|