From 6c85726c21614cca25ab6d51055d7b7e92bbbefc Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 26 Feb 2020 22:40:06 -0600 Subject: [PATCH] Dont flip shits when javascript script engine isn't available --- patches/server/0083-Add-sleep-options.patch | 6 +++--- .../server/0088-Add-player-death-exp-control-options.patch | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/patches/server/0083-Add-sleep-options.patch b/patches/server/0083-Add-sleep-options.patch index c72cb6649..1ff68f233 100644 --- a/patches/server/0083-Add-sleep-options.patch +++ b/patches/server/0083-Add-sleep-options.patch @@ -1,4 +1,4 @@ -From 36589593a6ae2b75e7a175cefcc5e0ff3be9c07b Mon Sep 17 00:00:00 2001 +From 31579dc05bedfcaa549efc5c7c89dc5edf69c713 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 30 Nov 2019 03:30:17 -0600 Subject: [PATCH] Add sleep options @@ -9,7 +9,7 @@ Subject: [PATCH] Add sleep options 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 9d26bd1e4c..12e5ff43f9 100644 +index 9d26bd1e4c..36582a80af 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -143,6 +143,21 @@ public abstract class EntityHuman extends EntityLiving { @@ -24,7 +24,7 @@ index 9d26bd1e4c..12e5ff43f9 100644 + try { + scriptEngine.eval("time = " + world.getDayTime()); + return !(Boolean) scriptEngine.eval(world.purpurConfig.playerSleepCondition); -+ } catch (javax.script.ScriptException ignore) { ++ } catch (Exception ignore) { + } + } + return world.isDay(); diff --git a/patches/server/0088-Add-player-death-exp-control-options.patch b/patches/server/0088-Add-player-death-exp-control-options.patch index a24eff877..cf075c031 100644 --- a/patches/server/0088-Add-player-death-exp-control-options.patch +++ b/patches/server/0088-Add-player-death-exp-control-options.patch @@ -1,4 +1,4 @@ -From 28e2152ff57c891c2736b59121f6ba15471a4b5a Mon Sep 17 00:00:00 2001 +From 8744eed26c1d415e410c070f23fda74b0a9fa902 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 26 Dec 2019 22:08:37 -0600 Subject: [PATCH] Add player death exp control options @@ -9,7 +9,7 @@ Subject: [PATCH] Add player death exp control options 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 12e5ff43f9..427a32cdd7 100644 +index 12e5ff43f9..5ffd2a2f51 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -1862,9 +1862,18 @@ public abstract class EntityHuman extends EntityLiving { @@ -26,7 +26,7 @@ index 12e5ff43f9..427a32cdd7 100644 + scriptEngine.eval("expTotal = " + expTotal); + scriptEngine.eval("exp = " + exp); + toDrop = (int) Math.round((Double) scriptEngine.eval(world.purpurConfig.playerDeathExpDropEquation)); -+ } catch (javax.script.ScriptException ignore) { ++ } catch (Exception ignore) { + toDrop = expLevel * 7; + } + return Math.min(toDrop, world.purpurConfig.playerDeathExpDropMax);