2020-05-06 11:48:49 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2014-12-22 22:13:29 +01:00
|
|
|
From: Aikar <aikar@aikar.co>
|
2016-03-01 00:09:49 +01:00
|
|
|
Date: Tue, 1 Mar 2016 23:52:34 -0600
|
2014-12-22 22:13:29 +01:00
|
|
|
Subject: [PATCH] Prevent tile entity and entity crashes
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
|
2020-05-06 11:48:49 +02:00
|
|
|
index fa6400dccd4df635d696e0858c0c164a0f19b4a4..e2f3cec7420edbd284b531ca7d1d121459fc098c 100644
|
2014-12-22 22:13:29 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/TileEntity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/TileEntity.java
|
2019-12-11 01:56:03 +01:00
|
|
|
@@ -194,7 +194,12 @@ public abstract class TileEntity implements KeyedObject { // Paper
|
|
|
|
return IRegistry.BLOCK_ENTITY_TYPE.getKey(this.getTileType()) + " // " + this.getClass().getCanonicalName();
|
2015-03-08 02:16:09 +01:00
|
|
|
});
|
2014-12-22 22:13:29 +01:00
|
|
|
if (this.world != null) {
|
2018-07-15 03:53:17 +02:00
|
|
|
- CrashReportSystemDetails.a(crashreportsystemdetails, this.position, this.getBlock());
|
2016-03-01 00:09:49 +01:00
|
|
|
+ // Paper start - Prevent TileEntity and Entity crashes
|
2018-07-15 03:53:17 +02:00
|
|
|
+ IBlockData block = this.getBlock();
|
2015-03-08 02:16:09 +01:00
|
|
|
+ if (block != null) {
|
2018-07-15 03:53:17 +02:00
|
|
|
+ CrashReportSystemDetails.a(crashreportsystemdetails, this.position, block);
|
2014-12-22 22:13:29 +01:00
|
|
|
+ }
|
2016-03-01 00:09:49 +01:00
|
|
|
+ // Paper end
|
2018-07-15 03:53:17 +02:00
|
|
|
CrashReportSystemDetails.a(crashreportsystemdetails, this.position, this.world.getType(this.position));
|
|
|
|
}
|
|
|
|
}
|
2014-12-22 22:13:29 +01:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
2020-05-24 04:27:37 +02:00
|
|
|
index b69d84baf8d318968ef171232e493a315f71814b..ca3b4c9f2f7e1b5425e8be4c3d11e3e881915e8b 100644
|
2014-12-22 22:13:29 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
2020-05-24 04:27:37 +02:00
|
|
|
@@ -665,11 +665,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
|
2019-05-14 04:20:58 +02:00
|
|
|
|
2019-04-24 04:34:11 +02:00
|
|
|
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);
|
2016-03-01 00:09:49 +01:00
|
|
|
+ // Paper start - Prevent tile entity and entity crashes
|
2014-12-22 22:13:29 +01:00
|
|
|
+ System.err.println("TileEntity threw exception at " + tileentity.world.getWorld().getName() + ":" + tileentity.position.getX() + "," + tileentity.position.getY() + "," + tileentity.position.getZ());
|
2019-04-24 04:34:11 +02:00
|
|
|
+ throwable.printStackTrace();
|
2015-09-19 16:34:17 +02:00
|
|
|
+ tilesThisCycle--;
|
2016-03-01 00:09:49 +01:00
|
|
|
+ this.tileEntityListTick.remove(tileTickPosition--);
|
2014-12-22 22:13:29 +01:00
|
|
|
+ continue;
|
2016-03-01 00:09:49 +01:00
|
|
|
+ // Paper end
|
2014-12-22 22:13:29 +01:00
|
|
|
}
|
|
|
|
// Spigot start
|
|
|
|
finally {
|
2020-05-24 04:27:37 +02:00
|
|
|
@@ -735,11 +737,12 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
|
2019-07-08 04:54:40 +02:00
|
|
|
try {
|
2019-04-24 04:34:11 +02:00
|
|
|
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
|
2019-12-11 03:43:21 +01:00
|
|
|
+ System.err.println("Entity threw exception at " + entity.world.getWorld().getName() + ":" + entity.locX() + "," + entity.locY() + "," + entity.locZ());
|
2019-04-24 04:34:11 +02:00
|
|
|
+ throwable.printStackTrace();
|
|
|
|
+ entity.dead = true;
|
|
|
|
+ return;
|
|
|
|
+ // Paper end
|
2019-07-08 04:54:40 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|