2019-05-06 04:58:04 +02:00
|
|
|
From d3030029a797dd7be902e3c097c3821d170c7560 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
|
2019-05-06 04:58:04 +02:00
|
|
|
index da30d2cf86..acd9edd670 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-05-06 04:58:04 +02:00
|
|
|
@@ -197,7 +197,12 @@ public abstract class TileEntity implements KeyedObject { // Paper
|
2019-04-24 04:34:11 +02:00
|
|
|
return IRegistry.BLOCK_ENTITY_TYPE.getKey(this.q()) + " // " + 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
|
2019-05-06 04:58:04 +02:00
|
|
|
index 0d8e622294..051d7531d1 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
|
2019-04-24 04:34:11 +02:00
|
|
|
@@ -674,11 +674,13 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
|
2018-12-17 06:18:06 +01:00
|
|
|
((ITickable) tileentity).tick();
|
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 {
|
2019-04-24 04:34:11 +02:00
|
|
|
@@ -747,11 +749,12 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
|
|
|
|
// Spigot end
|
|
|
|
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
|
|
|
|
}
|
|
|
|
// Spigot start
|
|
|
|
finally {
|
2014-12-22 22:13:29 +01:00
|
|
|
--
|
2019-04-23 06:47:07 +02:00
|
|
|
2.21.0
|
2014-12-22 22:13:29 +01:00
|
|
|
|