Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2024-11-06 02:39:48 +01:00
Code Issues Projects Releases Wiki Activity

Added bats to animals for the time being. Fixes #996

Browse Source
This commit is contained in:
Jeremy Wood 2012-12-10 23:27:55 -05:00
parent 186d3f15a4
commit 55741b524d
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/onarandombox/MultiverseCore/utils/SimpleWorldPurger.java
View File

@ -35,8 +35,16 @@ public class SimpleWorldPurger implements WorldPurger {
private MultiverseCore plugin; private MultiverseCore plugin;
private Class<Entity> ambientClass = null;
public SimpleWorldPurger(MultiverseCore plugin) { public SimpleWorldPurger(MultiverseCore plugin) {
this.plugin = plugin; this.plugin = plugin;
try {
Class entityClass = Class.forName("org.bukkit.entity.Ambient");
if (Entity.class.isAssignableFrom(entityClass)) {
ambientClass = entityClass;
}
} catch (ClassNotFoundException ignore) { }
} }
/** /**
@ -130,7 +138,8 @@ public class SimpleWorldPurger implements WorldPurger {
boolean negateMonsters, boolean specifiedAnimals, boolean specifiedMonsters) { boolean negateMonsters, boolean specifiedAnimals, boolean specifiedMonsters) {
boolean negate = false; boolean negate = false;
boolean specified = false; boolean specified = false;
if (e instanceof Golem || e instanceof Squid || e instanceof Animals) { if (e instanceof Golem || e instanceof Squid || e instanceof Animals
|| (ambientClass != null && ambientClass.isInstance(e))) {
// it's an animal // it's an animal
if (specifiedAnimals && !negateAnimals) { if (specifiedAnimals && !negateAnimals) {
Logging.finest("Removing an entity because I was told to remove all animals in world %s: %s", e.getWorld().getName(), e); Logging.finest("Removing an entity because I was told to remove all animals in world %s: %s", e.getWorld().getName(), e);