From 855c01a46baa63e4c49c0a2127f880cc18ffb5f2 Mon Sep 17 00:00:00 2001
From: Super_ <awesomegamer156@gmail.com>
Date: Mon, 23 Dec 2019 23:21:52 -0500
Subject: [PATCH] just stupid shit

---
 .../totalfreedommod/command/Command_entitywipe.java |  7 +++++--
 .../totalfreedommod/command/Command_gtfo.java       | 13 ++++++++++---
 .../totalfreedommod/command/Command_purgeall.java   |  5 ++++-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_entitywipe.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_entitywipe.java
index ceca6734..805f4446 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_entitywipe.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_entitywipe.java
@@ -23,8 +23,11 @@ public class Command_entitywipe extends FreedomCommand
         {
             for (Entity entity : world.getEntities())
             {
-                entity.remove();
-                removed++;
+                if (!(entity instanceof Player))
+                {
+                    entity.remove();
+                    removed++;
+                }
             }
         }
         msg(removed + " entities removed.");
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gtfo.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gtfo.java
index 258da68e..2132a6fe 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gtfo.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gtfo.java
@@ -1,8 +1,6 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import me.totalfreedom.totalfreedommod.banning.Ban;
 import me.totalfreedom.totalfreedommod.player.PlayerData;
@@ -11,8 +9,10 @@ import me.totalfreedom.totalfreedommod.punishments.PunishmentType;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import static me.totalfreedom.totalfreedommod.util.FUtil.playerMsg;
+import net.pravian.aero.util.Ips;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
@@ -148,10 +148,17 @@ public class Command_gtfo extends FreedomCommand
         playerMsg(sender, ChatColor.GRAY + username + " has been banned and IP is: " + StringUtils.join(ips, ", "));
         FUtil.bcastMsg(bcast.toString());
 
-        // Kick player
+        // Kick player and handle others on IP
         if (player != null)
         {
             player.kickPlayer(ban.bakeKickMessage());
+            for (Player p : Bukkit.getOnlinePlayers())
+            {
+                if (Ips.getIp(p).equals(Ips.getIp(player)))
+                {
+                    p.kickPlayer(ChatColor.RED + "You've been kicked because someone on your IP has been banned.");
+                }
+            }
         }
 
         // Log ban
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_purgeall.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_purgeall.java
index 091b972c..193814b8 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_purgeall.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_purgeall.java
@@ -26,7 +26,10 @@ public class Command_purgeall extends FreedomCommand
         {
             for (Entity entity : world.getEntities())
             {
-                entity.remove();
+                if (!(entity instanceof Player))
+                {
+                    entity.remove();
+                }
             }
         }