This commit is contained in:
ZeroEpoch1969 2020-01-11 19:59:12 -07:00
parent 6d0400cdf3
commit 5641d0d504
No known key found for this signature in database
GPG Key ID: A7BAB4E14F089CF3
2 changed files with 5 additions and 19 deletions

18
pom.xml
View File

@ -39,11 +39,6 @@
</scm> </scm>
<repositories> <repositories>
<repository>
<id>ess-repo</id>
<url>https://ci.ender.zone/plugin/repository/everything/</url>
</repository>
<repository> <repository>
<id>jitpack.io</id> <id>jitpack.io</id>
<url>https://jitpack.io</url> <url>https://jitpack.io</url>
@ -142,21 +137,14 @@
<dependency> <dependency>
<groupId>com.github.TFPatches</groupId> <groupId>com.github.TFPatches</groupId>
<artifactId>TF-LibsDisguises</artifactId> <artifactId>TF-LibsDisguises</artifactId>
<version>89efd2c93e</version> <version>11aea9b3cd</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.TFPatches</groupId>
<artifactId>TotalFreedomMod</artifactId>
<version>4a91c81</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.TFPatches</groupId> <groupId>com.github.TFPatches</groupId>
<artifactId>TF-WorldEdit</artifactId> <artifactId>TF-WorldEdit</artifactId>
<version>0909dc1972</version> <version>fd3f56f015</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@ -184,7 +172,7 @@
<dependency> <dependency>
<groupId>com.github.TFPatches</groupId> <groupId>com.github.TFPatches</groupId>
<artifactId>TF-WorldGuard</artifactId> <artifactId>TF-WorldGuard</artifactId>
<version>50fd4cb470</version> <version>bb12813214</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>

View File

@ -31,7 +31,6 @@ public class EntityWiper extends FreedomService
@Override @Override
protected void onStart() protected void onStart()
{ {
BLACKLIST.addAll(Groups.MOB_TYPES);
// Continuous Entity Wiper // Continuous Entity Wiper
wiper = new BukkitRunnable() wiper = new BukkitRunnable()
{ {
@ -46,7 +45,6 @@ public class EntityWiper extends FreedomService
@Override @Override
protected void onStop() protected void onStop()
{ {
BLACKLIST.removeAll(Groups.MOB_TYPES);
wiper.cancel(); wiper.cancel();
wiper = null; wiper = null;
} }
@ -60,7 +58,7 @@ public class EntityWiper extends FreedomService
{ {
for (Entity entity : world.getEntities()) for (Entity entity : world.getEntities())
{ {
if (!BLACKLIST.contains(entity.getType())) if (!BLACKLIST.contains(entity.getType()) && !Groups.MOB_TYPES.contains(entity.getType()))
{ {
entity.remove(); entity.remove();
removed++; removed++;