2014-11-29 01:06:26 +01:00
|
|
|
From 49b0c41fc7fde1660d06dbb04f5b0278935f9b92 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
|
2014-11-29 01:06:26 +01:00
|
|
|
index 0d2682d..e82c297 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
|
2014-11-28 02:17:45 +01:00
|
|
|
@@ -717,7 +717,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
|
2014-07-21 22:46:54 +02:00
|
|
|
worldserver.doTick();
|
|
|
|
worldserver.timings.doTick.stopTiming(); // Spigot
|
2014-11-28 02:17:45 +01:00
|
|
|
} catch (Throwable throwable1) {
|
2014-07-21 22:46:54 +02:00
|
|
|
+ // Spigot Start
|
|
|
|
+ try {
|
2014-11-28 02:17:45 +01:00
|
|
|
crashreport = CrashReport.a(throwable1, "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);
|
|
|
|
}
|
2014-11-28 02:17:45 +01:00
|
|
|
@@ -727,7 +733,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
|
2014-07-21 22:46:54 +02:00
|
|
|
worldserver.tickEntities();
|
|
|
|
worldserver.timings.tickEntities.stopTiming(); // Spigot
|
2014-11-28 02:17:45 +01:00
|
|
|
} catch (Throwable throwable2) {
|
2014-07-21 22:46:54 +02:00
|
|
|
+ // Spigot Start
|
|
|
|
+ try {
|
2014-11-28 02:17:45 +01:00
|
|
|
crashreport = CrashReport.a(throwable2, "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
|
|
|
|