Преглед на файлове

Properly fixed the NPE in dropItem
It was due to bad logic in Herbalism

bm01 преди 12 години
родител
ревизия
6d871c9bdb
променени са 2 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 1 1
      src/main/java/com/gmail/nossr50/skills/herbalism/Herbalism.java
  2. 1 1
      src/main/java/com/gmail/nossr50/util/Misc.java

+ 1 - 1
src/main/java/com/gmail/nossr50/skills/herbalism/Herbalism.java

@@ -196,7 +196,7 @@ public class Herbalism {
             if (chance > Misc.getRandom().nextInt(activationChance)) {
                 Location location = block.getLocation();
 
-                if (herbalismBlock != null && herbalismBlock.canDoubleDrop()) {
+                if (dropItem != null && herbalismBlock.canDoubleDrop()) {
                     Misc.dropItems(location, dropItem, dropAmount);
                 }
                 else if (customBlock != null){

+ 1 - 1
src/main/java/com/gmail/nossr50/util/Misc.java

@@ -344,7 +344,7 @@ public final class Misc {
      */
     public static void dropItem(Location location, ItemStack itemStack) {
 
-        if (itemStack == null || itemStack.getType() == Material.AIR) {
+        if (itemStack.getType() == Material.AIR) {
             return;
         }