2018-01-22 01:19:57 +11:00
|
|
|
From c55a7672b5eb02ff15c28b5d679c8c5921d15e40 Mon Sep 17 00:00:00 2001
|
2014-04-12 14:18:37 +10:00
|
|
|
From: md_5 <git@md-5.net>
|
|
|
|
Date: Sun, 12 Jan 2014 20:56:41 +1100
|
|
|
|
Subject: [PATCH] Try and Debug Crash Reports Crashing
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
2017-09-18 20:00:00 +10:00
|
|
|
index 399337a3e..fede33187 100644
|
2014-04-12 14:18:37 +10:00
|
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
2017-08-03 23:00:00 +10:00
|
|
|
@@ -765,7 +765,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
|
2014-04-12 14:18:37 +10:00
|
|
|
worldserver.doTick();
|
2014-07-07 18:59:02 -04:00
|
|
|
worldserver.timings.doTick.stopTiming(); // Spigot
|
2015-02-28 11:36:22 +00:00
|
|
|
} catch (Throwable throwable) {
|
2014-04-12 14:18:37 +10:00
|
|
|
+ // Spigot Start
|
|
|
|
+ try {
|
2015-02-28 11:36:22 +00:00
|
|
|
crashreport = CrashReport.a(throwable, "Exception ticking world");
|
2014-04-12 14:18:37 +10:00
|
|
|
+ } catch (Throwable t){
|
|
|
|
+ throw new RuntimeException("Error generating crash report", t);
|
|
|
|
+ }
|
|
|
|
+ // Spigot End
|
|
|
|
worldserver.a(crashreport);
|
|
|
|
throw new ReportedException(crashreport);
|
|
|
|
}
|
2017-08-03 23:00:00 +10:00
|
|
|
@@ -775,7 +781,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
|
2014-04-12 14:18:37 +10:00
|
|
|
worldserver.tickEntities();
|
2014-07-07 18:59:02 -04:00
|
|
|
worldserver.timings.tickEntities.stopTiming(); // Spigot
|
2015-02-28 11:36:22 +00:00
|
|
|
} catch (Throwable throwable1) {
|
2014-04-12 14:18:37 +10:00
|
|
|
+ // Spigot Start
|
|
|
|
+ try {
|
2015-02-28 11:36:22 +00:00
|
|
|
crashreport = CrashReport.a(throwable1, "Exception ticking world entities");
|
2014-04-12 14:18:37 +10:00
|
|
|
+ } catch (Throwable t){
|
|
|
|
+ throw new RuntimeException("Error generating crash report", t);
|
|
|
|
+ }
|
|
|
|
+ // Spigot End
|
|
|
|
worldserver.a(crashreport);
|
|
|
|
throw new ReportedException(crashreport);
|
|
|
|
}
|
|
|
|
--
|
2017-11-17 10:24:35 +11:00
|
|
|
2.14.1
|
2014-04-12 14:18:37 +10:00
|
|
|
|