diff --git a/src/main/java/rip/tilly/bedwars/generators/Generator.java b/src/main/java/rip/tilly/bedwars/generators/Generator.java
index 8509948..b8abf2a 100644
--- a/src/main/java/rip/tilly/bedwars/generators/Generator.java
+++ b/src/main/java/rip/tilly/bedwars/generators/Generator.java
@@ -93,8 +93,8 @@ public class Generator {
         }
 
         ItemStack drop = new ItemStack(material, 1);
-        this.location.getWorld().dropItemNaturally(this.location, drop);
         this.game.getDroppedItems().add(drop);
+        this.location.getWorld().dropItemNaturally(this.location, drop);
     }
 
     public void setActivated(boolean activated) {
diff --git a/src/main/java/rip/tilly/bedwars/listeners/RandomListeners.java b/src/main/java/rip/tilly/bedwars/listeners/RandomListeners.java
index 727263a..e81e8ed 100644
--- a/src/main/java/rip/tilly/bedwars/listeners/RandomListeners.java
+++ b/src/main/java/rip/tilly/bedwars/listeners/RandomListeners.java
@@ -74,7 +74,7 @@ public class RandomListeners implements Listener {
 
     @EventHandler
     public void onCreatureSpawn(CreatureSpawnEvent event) {
-        if (event.getEntity().getType() != EntityType.ARMOR_STAND) {
+        if (event.getEntity().getType() != EntityType.ARMOR_STAND && event.getEntity().getType() != EntityType.VILLAGER) {
             event.setCancelled(true);
         }
     }