Add allow-mob-drops flag.

NerdNu · Oct 21, 2014 · b391240 · b391240
1 parent 26e33a8
commit b391240
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -8,6 +8,8 @@ Available flags:
 |-----------------------|---------------|
 | compass               | true          |
 | allow-drops           | true          |
+| allow-mob-drops       | true          |
+| sprint                | true          |
 | use-dispenser         | true          |
 | use-note-block        | false         |
 | use-workbench         | true          |

diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.michaelelin</groupId>
   <artifactId>NerdFlags</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>0.0.1</version>
   <build>
     <sourceDirectory>${basedir}/src</sourceDirectory>
     <resources>

diff --git a/src/com/michaelelin/NerdFlags/NerdFlagsListener.java b/src/com/michaelelin/NerdFlags/NerdFlagsListener.java
@@ -7,6 +7,7 @@
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
+import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.event.entity.ItemSpawnEvent;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
@@ -38,7 +39,15 @@ public void onItemSpawn(ItemSpawnEvent event) {
         }
     }
 
- // WE checks this at a NORMAL priority, so we'll intercept it beforehand.
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onEntityDeath(EntityDeathEvent event) {
+        ApplicableRegionSet setAtLocation = worldguard.getGlobalRegionManager().get(event.getEntity().getLocation().getWorld()).getApplicableRegions(event.getEntity().getLocation());
+        if (!setAtLocation.allows(plugin.ALLOW_MOB_DROPS)) {
+            event.getDrops().clear();
+        }
+    }
+
+    // WE checks this at a NORMAL priority, so we'll intercept it beforehand.
     @EventHandler(priority = EventPriority.LOW)
     public void onPlayerInteract(PlayerInteractEvent event) {
         if (event.getItem() != null && event.getItem().getTypeId() == worldedit.getWorldEdit().getConfiguration().navigationWand) {

diff --git a/src/com/michaelelin/NerdFlags/NerdFlagsPlugin.java b/src/com/michaelelin/NerdFlags/NerdFlagsPlugin.java
@@ -16,6 +16,7 @@ public class NerdFlagsPlugin extends JavaPlugin {
     private long timestamp;
 
     public StateFlag ALLOW_DROPS;
+    public StateFlag ALLOW_MOB_DROPS;
 
     public StateFlag COMPASS;
 
@@ -52,12 +53,16 @@ public void onEnable() {
             getServer().getPluginManager().registerEvents(listener, this);
 
             ALLOW_DROPS = new StateFlag("allow-drops", true);
+            ALLOW_MOB_DROPS = new StateFlag("allow-mob-drops", true);
             COMPASS = new StateFlag("compass", true);
+
             wgCustomFlagsPlugin.addCustomFlag(ALLOW_DROPS);
+            wgCustomFlagsPlugin.addCustomFlag(ALLOW_MOB_DROPS);
             wgCustomFlagsPlugin.addCustomFlag(COMPASS);
 
             saveDefaultConfig();
             loadConfig();
+
             wgCustomFlagsPlugin.addCustomFlag(USE_DISPENSER);
             wgCustomFlagsPlugin.addCustomFlag(USE_NOTE_BLOCK);
             wgCustomFlagsPlugin.addCustomFlag(USE_WORKBENCH);