66 Zeilen
3.7 KiB
Diff
66 Zeilen
3.7 KiB
Diff
|
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/World.java b/src/main/java/net/minecraft/world/level/World.java
|
||
|
|
index 62735e7908f86e31f7a89ce2071ddebe176c0385..87e37c38825ad20fc11f41ea2a4512753266d2b4 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/level/World.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/level/World.java
|
||
|
|
@@ -737,11 +737,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
|
||
|
|
|
||
|
|
gameprofilerfiller.exit();
|
||
|
|
} catch (Throwable throwable) {
|
||
|
|
- CrashReport crashreport = CrashReport.a(throwable, "Ticking block entity");
|
||
|
|
- CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Block entity being ticked");
|
||
|
|
-
|
||
|
|
- tileentity.a(crashreportsystemdetails);
|
||
|
|
- throw new ReportedException(crashreport);
|
||
|
|
+ // Paper start - Prevent tile entity and entity crashes
|
||
|
|
+ System.err.println("TileEntity threw exception at " + tileentity.world.getWorld().getName() + ":" + tileentity.position.getX() + "," + tileentity.position.getY() + "," + tileentity.position.getZ());
|
||
|
|
+ throwable.printStackTrace();
|
||
|
|
+ tilesThisCycle--;
|
||
|
|
+ this.tileEntityListTick.remove(tileTickPosition--);
|
||
|
|
+ continue;
|
||
|
|
+ // Paper end
|
||
|
|
// Spigot start
|
||
|
|
} finally {
|
||
|
|
tileentity.tickTimer.stopTiming();
|
||
|
|
@@ -806,11 +808,12 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
|
||
|
|
try {
|
||
|
|
consumer.accept(entity);
|
||
|
|
} catch (Throwable throwable) {
|
||
|
|
- CrashReport crashreport = CrashReport.a(throwable, "Ticking entity");
|
||
|
|
- CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being ticked");
|
||
|
|
-
|
||
|
|
- entity.appendEntityCrashDetails(crashreportsystemdetails);
|
||
|
|
- throw new ReportedException(crashreport);
|
||
|
|
+ // Paper start - Prevent tile entity and entity crashes
|
||
|
|
+ System.err.println("Entity threw exception at " + entity.world.getWorld().getName() + ":" + entity.locX() + "," + entity.locY() + "," + entity.locZ());
|
||
|
|
+ throwable.printStackTrace();
|
||
|
|
+ entity.dead = true;
|
||
|
|
+ return;
|
||
|
|
+ // Paper end
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/level/block/entity/TileEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TileEntity.java
|
||
|
|
index 9ebd91e1309938f81583eb3d4dd97fd39bcc930a..58789a6e285c31947508deae37caefe7e182278c 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/level/block/entity/TileEntity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/level/block/entity/TileEntity.java
|
||
|
|
@@ -208,7 +208,12 @@ public abstract class TileEntity implements net.minecraft.server.KeyedObject { /
|
||
|
|
return IRegistry.BLOCK_ENTITY_TYPE.getKey(this.getTileType()) + " // " + this.getClass().getCanonicalName();
|
||
|
|
});
|
||
|
|
if (this.world != null) {
|
||
|
|
- CrashReportSystemDetails.a(crashreportsystemdetails, this.position, this.getBlock());
|
||
|
|
+ // Paper start - Prevent TileEntity and Entity crashes
|
||
|
|
+ IBlockData block = this.getBlock();
|
||
|
|
+ if (block != null) {
|
||
|
|
+ CrashReportSystemDetails.a(crashreportsystemdetails, this.position, block);
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
CrashReportSystemDetails.a(crashreportsystemdetails, this.position, this.world.getType(this.position));
|
||
|
|
}
|
||
|
|
}
|