2015-02-12 14:25:18 +00:00
|
|
|
From 489e85227ca259087ed35f62069cdda5f9d096f4 Mon Sep 17 00:00:00 2001
|
2014-07-21 20:46:54 +00: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
|
2015-02-12 14:25:18 +00:00
|
|
|
index 85b4bf9..0ee0c21 100644
|
2014-07-21 20:46:54 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
2015-02-12 14:25:18 +00:00
|
|
|
@@ -730,7 +730,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
|
2014-07-21 20:46:54 +00:00
|
|
|
worldserver.doTick();
|
|
|
|
worldserver.timings.doTick.stopTiming(); // Spigot
|
2014-11-28 01:17:45 +00:00
|
|
|
} catch (Throwable throwable1) {
|
2014-07-21 20:46:54 +00:00
|
|
|
+ // Spigot Start
|
|
|
|
+ try {
|
2014-11-28 01:17:45 +00:00
|
|
|
crashreport = CrashReport.a(throwable1, "Exception ticking world");
|
2014-07-21 20:46:54 +00:00
|
|
|
+ } catch (Throwable t){
|
|
|
|
+ throw new RuntimeException("Error generating crash report", t);
|
|
|
|
+ }
|
|
|
|
+ // Spigot End
|
|
|
|
worldserver.a(crashreport);
|
|
|
|
throw new ReportedException(crashreport);
|
|
|
|
}
|
2015-02-12 14:25:18 +00:00
|
|
|
@@ -740,7 +746,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
|
2014-07-21 20:46:54 +00:00
|
|
|
worldserver.tickEntities();
|
|
|
|
worldserver.timings.tickEntities.stopTiming(); // Spigot
|
2014-11-28 01:17:45 +00:00
|
|
|
} catch (Throwable throwable2) {
|
2014-07-21 20:46:54 +00:00
|
|
|
+ // Spigot Start
|
|
|
|
+ try {
|
2014-11-28 01:17:45 +00:00
|
|
|
crashreport = CrashReport.a(throwable2, "Exception ticking world entities");
|
2014-07-21 20:46:54 +00:00
|
|
|
+ } catch (Throwable t){
|
|
|
|
+ throw new RuntimeException("Error generating crash report", t);
|
|
|
|
+ }
|
|
|
|
+ // Spigot End
|
|
|
|
worldserver.a(crashreport);
|
|
|
|
throw new ReportedException(crashreport);
|
|
|
|
}
|
|
|
|
--
|
2014-11-28 01:17:45 +00:00
|
|
|
2.1.0
|
2014-07-21 20:46:54 +00:00
|
|
|
|