From df370e64589db9e4266cbffa64493e48646a5d4f Mon Sep 17 00:00:00 2001 From: Ryan Wild Date: Wed, 31 May 2017 14:13:52 +0100 Subject: [PATCH 1/4] Added a catch for if a player is caged and kicked. Resolves #1789 --- pom.xml | 84 ++++++++++++------- .../totalfreedommod/caging/Cager.java | 13 +++ .../totalfreedommod/command/Command_gtfo.java | 4 + 3 files changed, 71 insertions(+), 30 deletions(-) diff --git a/pom.xml b/pom.xml index 62df513ff..5cbd8a19d 100644 --- a/pom.xml +++ b/pom.xml @@ -43,8 +43,24 @@ - spigot - https://hub.spigotmc.org/nexus/content/groups/public/ + ess-repo + http://repo.ess3.net + + + jitpack.io + https://jitpack.io + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + elmakers-repo + http://maven.elmakers.com/repository/ + + + sk89q-snapshots + http://maven.sk89q.com/artifactory/repo @@ -59,51 +75,59 @@ org.spigotmc - spigot-server - 1.12 - system - ${project.basedir}/lib/Spigot-1.12.jar + spigot + 1.11.2-R0.1-SNAPSHOT + provided - net.pravian - aero - 2.0 - system - ${project.basedir}/lib/Aero-2.0.jar + com.github.Pravian + Aero + a0e1dc5 + provided - net.totalfreedom - bukkittelnet - 4.2 - system - ${project.basedir}/lib/BukkitTelnet-4.3.jar + com.github.TotalFreedom + BukkitTelnet + v4.4 + provided - net.totalfreedom - tf-worldedit + com.github.TotalFreedom.TF-WorldEdit + worldedit-bukkit 6.1.0-TF - system - ${project.basedir}/lib/TF-WorldEdit-6.1.1.jar + provided + + + + com.github.TotalFreedom.TF-WorldEdit + worldedit-core + 6.1.0-TF + provided - net.totalfreedom - tf-essentials - 2.0-TF - system - ${project.basedir}/lib/TF-Essentials-2.1.jar + org.bukkit + craftbukkit + 1.11.2-R0.1-SNAPSHOT + provided - me.libaryaddict.disguise - LibsDisguises - 9.0.9 - system - ${project.basedir}/lib/LibsDisguises-9.0.9.jar + net.ess3 + Essentials + 2.13.1 + provided + + + com.github.TotalFreedom + TF-LibsDisguises + 1.11-SNAPSHOT + provided + diff --git a/src/main/java/me/totalfreedom/totalfreedommod/caging/Cager.java b/src/main/java/me/totalfreedom/totalfreedommod/caging/Cager.java index 9c50b0ae2..4418f4262 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/caging/Cager.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/caging/Cager.java @@ -13,6 +13,7 @@ import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerMoveEvent; import org.bukkit.event.player.PlayerQuitEvent; +import org.bukkit.event.player.PlayerKickEvent; public class Cager extends FreedomService { @@ -95,6 +96,18 @@ public void onPlayerQuit(PlayerQuitEvent event) } } + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + public void onPlayerKick(PlayerKickEvent event) + { + FPlayer player = plugin.pl.getPlayer(event.getPlayer()); + CageData cage = player.getCageData(); + + if (cage.isCaged()) + { + cage.playerQuit(); + } + } + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onPlayerJoin(PlayerJoinEvent event) { 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 80a832ddd..9dfb361c3 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gtfo.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gtfo.java @@ -1,6 +1,8 @@ package me.totalfreedom.totalfreedommod.command; import me.totalfreedom.totalfreedommod.banning.Ban; +import me.totalfreedom.totalfreedommod.caging.CageData; +import me.totalfreedom.totalfreedommod.player.FPlayer; import me.totalfreedom.totalfreedommod.rank.Rank; import me.totalfreedom.totalfreedommod.util.FUtil; import net.pravian.aero.util.Ips; @@ -21,6 +23,8 @@ public class Command_gtfo extends FreedomCommand @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { + ; + if (args.length == 0) { return false; From f282bf1be6ba9bae2bf06c10f234f6c6b062405e Mon Sep 17 00:00:00 2001 From: Ryan Wild Date: Wed, 31 May 2017 14:16:01 +0100 Subject: [PATCH 2/4] Removed temporary POM file --- pom.xml | 84 +++++++++++++++++++++------------------------------------ 1 file changed, 30 insertions(+), 54 deletions(-) diff --git a/pom.xml b/pom.xml index 5cbd8a19d..62df513ff 100644 --- a/pom.xml +++ b/pom.xml @@ -43,24 +43,8 @@ - ess-repo - http://repo.ess3.net - - - jitpack.io - https://jitpack.io - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - elmakers-repo - http://maven.elmakers.com/repository/ - - - sk89q-snapshots - http://maven.sk89q.com/artifactory/repo + spigot + https://hub.spigotmc.org/nexus/content/groups/public/ @@ -75,59 +59,51 @@ org.spigotmc - spigot - 1.11.2-R0.1-SNAPSHOT - provided + spigot-server + 1.12 + system + ${project.basedir}/lib/Spigot-1.12.jar - com.github.Pravian - Aero - a0e1dc5 - provided + net.pravian + aero + 2.0 + system + ${project.basedir}/lib/Aero-2.0.jar - com.github.TotalFreedom - BukkitTelnet - v4.4 - provided + net.totalfreedom + bukkittelnet + 4.2 + system + ${project.basedir}/lib/BukkitTelnet-4.3.jar - com.github.TotalFreedom.TF-WorldEdit - worldedit-bukkit + net.totalfreedom + tf-worldedit 6.1.0-TF - provided - - - - com.github.TotalFreedom.TF-WorldEdit - worldedit-core - 6.1.0-TF - provided + system + ${project.basedir}/lib/TF-WorldEdit-6.1.1.jar - org.bukkit - craftbukkit - 1.11.2-R0.1-SNAPSHOT - provided + net.totalfreedom + tf-essentials + 2.0-TF + system + ${project.basedir}/lib/TF-Essentials-2.1.jar - net.ess3 - Essentials - 2.13.1 - provided + me.libaryaddict.disguise + LibsDisguises + 9.0.9 + system + ${project.basedir}/lib/LibsDisguises-9.0.9.jar - - - com.github.TotalFreedom - TF-LibsDisguises - 1.11-SNAPSHOT - provided - From 34afd9ec887f051701ce39124734ff955e6b4d3a Mon Sep 17 00:00:00 2001 From: Ryan Wild Date: Wed, 31 May 2017 14:20:48 +0100 Subject: [PATCH 3/4] Removed other fuck up there --- .../me/totalfreedom/totalfreedommod/command/Command_gtfo.java | 1 - 1 file changed, 1 deletion(-) 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 9dfb361c3..cd5a2cd5c 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gtfo.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gtfo.java @@ -23,7 +23,6 @@ public class Command_gtfo extends FreedomCommand @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - ; if (args.length == 0) { From 4e03aedbc14d5cb153e5d96a3f80f70f5e8ab2ae Mon Sep 17 00:00:00 2001 From: Ryan Wild Date: Wed, 31 May 2017 14:35:49 +0100 Subject: [PATCH 4/4] Removd unused imports within the GTFO command --- .../me/totalfreedom/totalfreedommod/command/Command_gtfo.java | 2 -- 1 file changed, 2 deletions(-) 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 cd5a2cd5c..b8360c361 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 me.totalfreedom.totalfreedommod.banning.Ban; -import me.totalfreedom.totalfreedommod.caging.CageData; -import me.totalfreedom.totalfreedommod.player.FPlayer; import me.totalfreedom.totalfreedommod.rank.Rank; import me.totalfreedom.totalfreedommod.util.FUtil; import net.pravian.aero.util.Ips;