From 5641d0d504607e5e142a81b1d0b48673198c34ae Mon Sep 17 00:00:00 2001
From: ZeroEpoch1969 <13510767+ZeroEpoch1969@users.noreply.github.com>
Date: Sat, 11 Jan 2020 19:59:12 -0700
Subject: [PATCH] oops
---
pom.xml | 20 ++++---------------
.../totalfreedommod/EntityWiper.java | 4 +---
2 files changed, 5 insertions(+), 19 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9b8eb1dd..6438bb69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
- Total Freedom
+ TotalFreedom
https://totalfreedom.me
@@ -39,11 +39,6 @@
-
- ess-repo
- https://ci.ender.zone/plugin/repository/everything/
-
-
jitpack.io
https://jitpack.io
@@ -142,21 +137,14 @@
com.github.TFPatches
TF-LibsDisguises
- 89efd2c93e
- provided
-
-
-
- com.github.TFPatches
- TotalFreedomMod
- 4a91c81
+ 11aea9b3cd
provided
com.github.TFPatches
TF-WorldEdit
- 0909dc1972
+ fd3f56f015
provided
@@ -184,7 +172,7 @@
com.github.TFPatches
TF-WorldGuard
- 50fd4cb470
+ bb12813214
provided
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/EntityWiper.java b/src/main/java/me/totalfreedom/totalfreedommod/EntityWiper.java
index f1af32b0..5e70f9c3 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/EntityWiper.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/EntityWiper.java
@@ -31,7 +31,6 @@ public class EntityWiper extends FreedomService
@Override
protected void onStart()
{
- BLACKLIST.addAll(Groups.MOB_TYPES);
// Continuous Entity Wiper
wiper = new BukkitRunnable()
{
@@ -46,7 +45,6 @@ public class EntityWiper extends FreedomService
@Override
protected void onStop()
{
- BLACKLIST.removeAll(Groups.MOB_TYPES);
wiper.cancel();
wiper = null;
}
@@ -60,7 +58,7 @@ public class EntityWiper extends FreedomService
{
for (Entity entity : world.getEntities())
{
- if (!BLACKLIST.contains(entity.getType()))
+ if (!BLACKLIST.contains(entity.getType()) && !Groups.MOB_TYPES.contains(entity.getType()))
{
entity.remove();
removed++;