+ Updated for latest Spigot build

* Removed deprecated calls to getItemInHand() * Fixed NPE in onDisable() * Modified file structure
bartenbach · Oct 3, 2016 · 955a015 · 955a015
1 parent d4c30c1
commit 955a015
Show file tree

Hide file tree

Showing 21 changed files with 392 additions and 392 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,4 @@
+out/*
+..gitignore.un~
+.gitignore~
+.idea/*
diff --git a/co/proxa/durabilitynotify/Armor.java → src/co/proxa/durabilitynotify/Armor.java b/co/proxa/durabilitynotify/Armor.java → src/co/proxa/durabilitynotify/Armor.java
diff --git a/...xa/durabilitynotify/DurabilityNotify.java → ...xa/durabilitynotify/DurabilityNotify.java b/...xa/durabilitynotify/DurabilityNotify.java → ...xa/durabilitynotify/DurabilityNotify.java
@@ -50,7 +50,7 @@ public void onEnable() {
         final Permissions p = new Permissions(this);
         final Tool t = new Tool(lm);
         a = new Armor(lm);
-        final BlockBreakListener bbl = new BlockBreakListener(lm);
+        final BlockBreakListener bbl = new BlockBreakListener();
         final BowListener bl = new BowListener(lm);
         final FishingListener fl = new FishingListener(lm);
         final CombatListener cl = new CombatListener(lm, a);
@@ -83,7 +83,9 @@ private void checkReminderThread(Armor a) {
 
     @Override
     public void onDisable() {
-        rt.stopThread();
+        if (rt != null) {
+            rt.stopThread();
+        }
         ln.clearMap();
     }