Fixed critical bug causing gold to not be removed

EarthMC · Nov 24, 2018 · 4637b08 · 4637b08
1 parent f8c3b3b
commit 4637b08
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 37 deletions.
diff --git a/pom.xml b/pom.xml
@@ -2,36 +2,36 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+<modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.karlofduty</groupId>
-    <artifactId>GoldDropRemover</artifactId>
-    <version>0.2.1</version>
+<groupId>com.karlofduty</groupId>
+<artifactId>GoldDropRemover</artifactId>
+<version>0.2.2</version>
 
-    <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-    </properties>
-    <repositories>
-        <repository>
-            <id>spigot-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
-        </repository>
-    </repositories>
-    <dependencies>
-        <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
-            <version>1.13.1-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <resources>
-            <resource>
-                <filtering>true</filtering>
-                <directory>src/main/resources/</directory>
-            </resource>
-        </resources>
-    </build>
+<properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+</properties>
+<repositories>
+    <repository>
+        <id>spigot-repo</id>
+        <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
+    </repository>
+</repositories>
+<dependencies>
+    <dependency>
+        <groupId>org.spigotmc</groupId>
+        <artifactId>spigot-api</artifactId>
+        <version>1.13.1-R0.1-SNAPSHOT</version>
+        <scope>provided</scope>
+    </dependency>
+</dependencies>
+<build>
+    <resources>
+        <resource>
+            <filtering>true</filtering>
+            <directory>src/main/resources/</directory>
+        </resource>
+    </resources>
+</build>
 </project>
diff --git a/src/main/java/com/karlofduty/GoldDropRemover/EntityDeathHandler.java b/src/main/java/com/karlofduty/GoldDropRemover/EntityDeathHandler.java
@@ -8,23 +8,22 @@
 import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.inventory.ItemStack;
 
-import java.util.List;
-
 public class EntityDeathHandler implements Listener
 {
     @EventHandler
     public void onDeath(EntityDeathEvent event)
     {
-        if(!(event.getEntity() instanceof PigZombie || event.getEntity() instanceof Drowned))
+        if(!(event.getEntity() instanceof PigZombie) && !(event.getEntity() instanceof Drowned))
         {
             return;
         }
-        List<ItemStack> items = event.getDrops();
         ItemStack goldIngot = new ItemStack(Material.GOLD_INGOT);
         ItemStack goldNugget = new ItemStack(Material.GOLD_NUGGET);
 
-        while(items.remove(goldIngot)){}
+        while(event.getDrops().remove(goldIngot)){}
+
+        while(event.getDrops().remove(goldNugget)){}
 
-        while(items.remove(goldNugget)){}
+        GoldDropRemover.log("Removed gold drops from entity death");
     }
 }
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: GoldDropRemover
-version: 0.2.1
+version: 0.2.2
 author: Karl Essinger (KarlofDuty)
 website: http://karlofduty.com
 main: com.karlofduty.GoldDropRemover.GoldDropRemover