summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2015-05-29 15:23:52 +1000
committermd_5 <git@md-5.net>2015-05-29 15:23:59 +1000
commite9980aa94fe4791ba8ec88560282a0bec5cf9cd5 (patch)
treebf51469cc9da13f65454fd893aa61747118411e2
parentd6ca19e0756faca5eab3f9685c2ecd578f746a1a (diff)
downloadcraftbukkit-e9980aa94fe4791ba8ec88560282a0bec5cf9cd5.tar
craftbukkit-e9980aa94fe4791ba8ec88560282a0bec5cf9cd5.tar.gz
craftbukkit-e9980aa94fe4791ba8ec88560282a0bec5cf9cd5.tar.lz
craftbukkit-e9980aa94fe4791ba8ec88560282a0bec5cf9cd5.tar.xz
craftbukkit-e9980aa94fe4791ba8ec88560282a0bec5cf9cd5.zip
BUILDTOOLS-114 / MC-80817 : Fix server not starting when native processor info cannot be initialized.
-rw-r--r--nms-patches/SystemUtils.patch11
1 files changed, 11 insertions, 0 deletions
diff --git a/nms-patches/SystemUtils.patch b/nms-patches/SystemUtils.patch
new file mode 100644
index 00000000..2ce12c01
--- /dev/null
+++ b/nms-patches/SystemUtils.patch
@@ -0,0 +1,11 @@
+--- a/net/minecraft/server/SystemUtils.java
++++ b/net/minecraft/server/SystemUtils.java
+@@ -32,7 +32,7 @@
+ Processor[] aprocessor = (new SystemInfo()).getHardware().getProcessors();
+
+ SystemUtils.a = String.format("%dx %s", new Object[] { Integer.valueOf(aprocessor.length), aprocessor[0]}).replaceAll("\\s+", " ");
+- } catch (Exception exception) {
++ } catch (Throwable exception) {
+ ;
+ }
+