Fix various startup errors on spigot/paper 1.12

DenizenScript · May 11, 2020 · b863718 · b863718
1 parent bfff93b
commit b863718
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/paper/src/main/java/com/denizenscript/denizen/paper/PaperModule.java b/paper/src/main/java/com/denizenscript/denizen/paper/PaperModule.java
@@ -27,13 +27,15 @@ public static void init() {
         ScriptEvent.registerScriptEvent(new PlayerClicksFakeEntityScriptEvent());
         ScriptEvent.registerScriptEvent(new PlayerEquipsArmorScriptEvent());
         ScriptEvent.registerScriptEvent(new PlayerJumpsPaperScriptEventImpl());
-        ScriptEvent.registerScriptEvent(new PlayerSpectatesEntityScriptEvent());
-        ScriptEvent.registerScriptEvent(new PlayerStopsSpectatingScriptEvent());
         if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_13)) {
+            ScriptEvent.registerScriptEvent(new PlayerSpectatesEntityScriptEvent());
+            ScriptEvent.registerScriptEvent(new PlayerStopsSpectatingScriptEvent());
             ScriptEvent.registerScriptEvent(new PreEntitySpawnScriptEvent());
         }
         ScriptEvent.registerScriptEvent(new ProjectileCollideScriptEvent());
-        ScriptEvent.registerScriptEvent(new TNTPrimesScriptEvent());
+        if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_13)) {
+            ScriptEvent.registerScriptEvent(new TNTPrimesScriptEvent());
+        }
         ScriptEvent.registerScriptEvent(new UnknownCommandScriptEvent());
 
         // Properties

diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/ScriptEventRegistry.java b/plugin/src/main/java/com/denizenscript/denizen/events/ScriptEventRegistry.java
@@ -82,7 +82,9 @@ public static void registerMainEvents() {
         ScriptEvent.registerScriptEvent(new EntityTamesScriptEvent());
         ScriptEvent.registerScriptEvent(new EntityTargetsScriptEvent());
         ScriptEvent.registerScriptEvent(new EntityTeleportScriptEvent());
-        ScriptEvent.registerScriptEvent(new EntityTransformScriptEvent());
+        if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_13)) {
+            ScriptEvent.registerScriptEvent(new EntityTransformScriptEvent());
+        }
         ScriptEvent.registerScriptEvent(new EntityUnleashedScriptEvent());
         ScriptEvent.registerScriptEvent(new FireworkBurstsScriptEvent());
         ScriptEvent.registerScriptEvent(new HangingBreaksScriptEvent());