2015-04-09 05:18:56 +02:00
|
|
|
From d1414054b147bad8488af98b0db340c6a55123f9 Mon Sep 17 00:00:00 2001
|
2014-07-21 22:46:54 +02: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-04-09 05:18:56 +02:00
|
|
|
index 3c50861..3dd4201 100644
|
2014-07-21 22:46:54 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
2015-03-08 12:04:41 +01:00
|
|
|
@@ -739,7 +739,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
|
2014-07-21 22:46:54 +02:00
|
|
|
worldserver.doTick();
|
|
|
|
worldserver.timings.doTick.stopTiming(); // Spigot
|
2015-02-28 12:36:22 +01:00
|
|
|
} catch (Throwable throwable) {
|
2014-07-21 22:46:54 +02:00
|
|
|
+ // Spigot Start
|
|
|
|
+ try {
|
2015-02-28 12:36:22 +01:00
|
|
|
crashreport = CrashReport.a(throwable, "Exception ticking world");
|
2014-07-21 22:46:54 +02:00
|
|
|
+ } catch (Throwable t){
|
|
|
|
+ throw new RuntimeException("Error generating crash report", t);
|
|
|
|
+ }
|
|
|
|
+ // Spigot End
|
|
|
|
worldserver.a(crashreport);
|
|
|
|
throw new ReportedException(crashreport);
|
|
|
|
}
|
2015-03-08 12:04:41 +01:00
|
|
|
@@ -749,7 +755,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
|
2014-07-21 22:46:54 +02:00
|
|
|
worldserver.tickEntities();
|
|
|
|
worldserver.timings.tickEntities.stopTiming(); // Spigot
|
2015-02-28 12:36:22 +01:00
|
|
|
} catch (Throwable throwable1) {
|
2014-07-21 22:46:54 +02:00
|
|
|
+ // Spigot Start
|
|
|
|
+ try {
|
2015-02-28 12:36:22 +01:00
|
|
|
crashreport = CrashReport.a(throwable1, "Exception ticking world entities");
|
2014-07-21 22:46:54 +02:00
|
|
|
+ } catch (Throwable t){
|
|
|
|
+ throw new RuntimeException("Error generating crash report", t);
|
|
|
|
+ }
|
|
|
|
+ // Spigot End
|
|
|
|
worldserver.a(crashreport);
|
|
|
|
throw new ReportedException(crashreport);
|
|
|
|
}
|
|
|
|
--
|
2014-11-28 02:17:45 +01:00
|
|
|
2.1.0
|
2014-07-21 22:46:54 +02:00
|
|
|
|