From 7b183612e48e40fba63858d6f7643582830b8fd8 Mon Sep 17 00:00:00 2001 From: Wild1145 Date: Sat, 7 Jan 2017 23:37:25 +0000 Subject: [PATCH 01/12] Moved all dependencies over to proper resoultion. Currently experiencing an issue with TF-WorldEdit not pulling custom additions --- pom.xml | 70 +++++++++++-------- .../totalfreedommod/ServerInterface.java | 8 +-- 2 files changed, 44 insertions(+), 34 deletions(-) diff --git a/pom.xml b/pom.xml index b35d71b5..a04f5692 100644 --- a/pom.xml +++ b/pom.xml @@ -43,8 +43,20 @@ - 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/ @@ -60,49 +72,47 @@ org.spigotmc spigot - 1.10 - system - ${project.basedir}/lib/Spigot-1.10.jar + 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 - 6.1.0-TF - system - ${project.basedir}/lib/TF-WorldEdit-6.1.1.jar + com.github.TotalFreedom + TF-WorldEdit + 63626093f3 - 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 + + + + com.github.TotalFreedom + TF-LibsDisguises + 913a577436 diff --git a/src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java b/src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java index 9979d2a9..e0e964cd 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java @@ -4,11 +4,11 @@ import java.util.Arrays; import java.util.List; import me.totalfreedom.totalfreedommod.util.FLog; import me.totalfreedom.totalfreedommod.util.FUtil; -import net.minecraft.server.v1_10_R1.EntityPlayer; -import net.minecraft.server.v1_10_R1.MinecraftServer; -import net.minecraft.server.v1_10_R1.PropertyManager; +import net.minecraft.server.v1_11_R1.EntityPlayer; +import net.minecraft.server.v1_11_R1.MinecraftServer; +import net.minecraft.server.v1_11_R1.PropertyManager; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_10_R1.CraftServer; +import org.bukkit.craftbukkit.v1_11_R1.CraftServer; public class ServerInterface extends FreedomService { From aaeee0d36ecf77d29b477ecd4b564e0fdcd312db Mon Sep 17 00:00:00 2001 From: Wild1145 Date: Sat, 7 Jan 2017 23:59:53 +0000 Subject: [PATCH 02/12] Final fix to the dependency resolution. Reverted minor changes to WorldEdit handling --- pom.xml | 6 +++--- .../totalfreedommod/bridge/WorldEditListener.java | 12 ++++++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index a04f5692..2dc4528a 100644 --- a/pom.xml +++ b/pom.xml @@ -91,9 +91,9 @@ - com.github.TotalFreedom - TF-WorldEdit - 63626093f3 + com.github.TotalFreedom.TF-WorldEdit + worldedit-bukkit + 6.1.0-TF diff --git a/src/main/java/me/totalfreedom/totalfreedommod/bridge/WorldEditListener.java b/src/main/java/me/totalfreedom/totalfreedommod/bridge/WorldEditListener.java index ed6548a6..ecf398d3 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/bridge/WorldEditListener.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/bridge/WorldEditListener.java @@ -2,8 +2,16 @@ package me.totalfreedom.totalfreedommod.bridge; import me.totalfreedom.totalfreedommod.TotalFreedomMod; import me.totalfreedom.totalfreedommod.util.FUtil; -import me.totalfreedom.worldedit.LimitChangedEvent; -import me.totalfreedom.worldedit.SelectionChangedEvent; +// These imports are not in the latest releases of WorldEdit, and the new versions of WorldEdit do not build properly. This will need to be reverted once the new WorldEdit builds are building properly. +// +//import me.totalfreedom.worldedit.LimitChangedEvent; +//import me.totalfreedom.worldedit.SelectionChangedEvent; +// +//The following two imports are a temporary measure as mentioned above. +// +import me.StevenLawson.worldedit.LimitChangedEvent; +import me.StevenLawson.worldedit.SelectionChangedEvent; +// import net.pravian.aero.component.PluginListener; import org.bukkit.ChatColor; import org.bukkit.entity.Player; From 60b143e248547a2ffa78ec7182ef63b89e1b5d79 Mon Sep 17 00:00:00 2001 From: Wild1145 Date: Sun, 8 Jan 2017 00:01:42 +0000 Subject: [PATCH 03/12] Added Travis YAML File for CI# --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..0079b649 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,5 @@ +language: java +jdk: + - oraclejdk8 +notifications: + email: false \ No newline at end of file From 0bb5265b77eddfd9835be935d40ad67944a1c835 Mon Sep 17 00:00:00 2001 From: Wild1145 Date: Sun, 8 Jan 2017 12:42:49 +0000 Subject: [PATCH 04/12] Fixed issues with POM file - Everything is resolving properly and CI is working --- pom.xml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2dc4528a..12989c04 100644 --- a/pom.xml +++ b/pom.xml @@ -58,6 +58,10 @@ elmakers-repo http://maven.elmakers.com/repository/ + + sk89q-snapshots + http://maven.sk89q.com/artifactory/repo + @@ -94,6 +98,14 @@ com.github.TotalFreedom.TF-WorldEdit worldedit-bukkit 6.1.0-TF + provided + + + + com.github.TotalFreedom.TF-WorldEdit + worldedit-core + 6.1.0-TF + provided @@ -107,12 +119,14 @@ net.ess3 Essentials 2.13.1 + provided com.github.TotalFreedom TF-LibsDisguises 913a577436 + provided @@ -274,4 +288,4 @@ - + \ No newline at end of file From f3130f5cfc0f120569ff996a20137cae1f69d479 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 19 Apr 2017 18:29:47 +0100 Subject: [PATCH 05/12] Update pom.xml Updated Libs Disguise version --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 12989c04..f73324bc 100644 --- a/pom.xml +++ b/pom.xml @@ -123,11 +123,11 @@ - com.github.TotalFreedom - TF-LibsDisguises - 913a577436 - provided - + com.github.TotalFreedom + TF-LibsDisguises + 913a577436 + provided + @@ -288,4 +288,4 @@ - \ No newline at end of file + From c8fb54182e518e0a599d48ac30cf6eed84288cc7 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 23 Apr 2017 17:17:14 +0100 Subject: [PATCH 06/12] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f73324bc..e80ef11d 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ com.github.TotalFreedom TF-LibsDisguises - 913a577436 + -SNAPSHOT provided From d2503da2988f6ddb3c7aa1236507d143fcac9e86 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 26 Apr 2017 22:34:14 +0100 Subject: [PATCH 07/12] Updated Libs Disguise Version Dependency It will now always pull the latest 1.11 branch commit, this should remain build-able and stable as it is a TF Project. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e80ef11d..5cbd8a19 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ com.github.TotalFreedom TF-LibsDisguises - -SNAPSHOT + 1.11-SNAPSHOT provided From 7245de15136653d22414263077f07bc1ba5b9a05 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 26 Apr 2017 22:36:20 +0100 Subject: [PATCH 08/12] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index ff8e687e..9853b931 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # TotalFreedomMod # +[![Build Status](https://travis-ci.org/Wild1145/TotalFreedomMod.svg?branch=maventravisci)](https://travis-ci.org/Wild1145/TotalFreedomMod) + TotalFreedomMod is a CraftBukkit server plugin designed primarily to support the [Official TotalFreedom Minecraft Server](http://totalfreedom.me/). However, you are more than welcome to adapt the source for your own server. This plugin was originally coded by StevenLawson (Madgeek1450), with Jerom van der Sar (Prozza) becoming heavily involved in its development some time later. It consists of over 85 custom coded commands and a large variety of distinguishable features not included in any other plugin. The plugin has since its beginning grown immensely. Together, with the main TotalFreedom server, TotalFreedomMod has a long-standing reputation of effectiveness whilst maintaining a clear feeling of openness towards the administrators and the players themselves. From f25207104c8fe4353c1db3b2eca8aa54348ad901 Mon Sep 17 00:00:00 2001 From: Wild1145 Date: Fri, 9 Jun 2017 15:02:30 +0100 Subject: [PATCH 09/12] Updated to 1.12 R01 for dependencies --- pom.xml | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 5cbd8a19..ff9209cc 100644 --- a/pom.xml +++ b/pom.xml @@ -70,63 +70,54 @@ org.projectlombok lombok 1.16.6 - provided org.spigotmc spigot - 1.11.2-R0.1-SNAPSHOT - provided + 1.12-R0.1-SNAPSHOT com.github.Pravian Aero a0e1dc5 - provided com.github.TotalFreedom BukkitTelnet v4.4 - provided com.github.TotalFreedom.TF-WorldEdit worldedit-bukkit 6.1.0-TF - provided com.github.TotalFreedom.TF-WorldEdit worldedit-core 6.1.0-TF - provided org.bukkit craftbukkit - 1.11.2-R0.1-SNAPSHOT - provided + 1.12-R0.1-SNAPSHOT net.ess3 Essentials 2.13.1 - provided com.github.TotalFreedom TF-LibsDisguises - 1.11-SNAPSHOT - provided + 1.11.2-SNAPSHOT From 8c424a45f932e23f372d5c8fb987e0ab5616dab4 Mon Sep 17 00:00:00 2001 From: "Ryan A. Wild SU" Date: Tue, 25 Jul 2017 09:46:48 +0100 Subject: [PATCH 10/12] Updated dependencies removing Libs Disguise due to unstable upstream repos --- pom.xml | 8 ++++---- .../totalfreedommod/bridge/LibsDisguisesBridge.java | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index ff9209cc..8de47369 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ com.github.TotalFreedom BukkitTelnet - v4.4 + 4.5-pre1 @@ -114,11 +114,11 @@ 2.13.1 - + diff --git a/src/main/java/me/totalfreedom/totalfreedommod/bridge/LibsDisguisesBridge.java b/src/main/java/me/totalfreedom/totalfreedommod/bridge/LibsDisguisesBridge.java index ed7bc978..330d8c1f 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/bridge/LibsDisguisesBridge.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/bridge/LibsDisguisesBridge.java @@ -1,4 +1,4 @@ -package me.totalfreedom.totalfreedommod.bridge; +/* package me.totalfreedom.totalfreedommod.bridge; import me.libraryaddict.disguise.DisallowedDisguises; import me.libraryaddict.disguise.LibsDisguises; @@ -136,3 +136,5 @@ public class LibsDisguisesBridge extends FreedomService return ld.isEnabled(); } } + +*/ \ No newline at end of file From e16714ea6c4a0e454200187bbdcf66ae363d412d Mon Sep 17 00:00:00 2001 From: Ryan Wild Date: Tue, 25 Jul 2017 10:20:36 +0100 Subject: [PATCH 11/12] Resolved dependency issues - Building correctly --- pom.xml | 2 +- .../bridge/LibsDisguisesBridge.java | 18 ++++++++---------- .../command/Command_disguisetoggle.java | 9 +++++++-- .../command/Command_undisguiseall.java | 9 +++++++-- 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 8de47369..b07aaaca 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ UTF-8 ${project.version} Electrum - ${maven.buildnumber} + ${maven.build.timestamp} ${buildAuthor} ${buildHead} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/bridge/LibsDisguisesBridge.java b/src/main/java/me/totalfreedom/totalfreedommod/bridge/LibsDisguisesBridge.java index 330d8c1f..256fca0e 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/bridge/LibsDisguisesBridge.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/bridge/LibsDisguisesBridge.java @@ -1,8 +1,8 @@ -/* package me.totalfreedom.totalfreedommod.bridge; +package me.totalfreedom.totalfreedommod.bridge; -import me.libraryaddict.disguise.DisallowedDisguises; -import me.libraryaddict.disguise.LibsDisguises; -import me.libraryaddict.disguise.DisguiseAPI; +//import me.libraryaddict.disguise.DisallowedDisguises; +//import me.libraryaddict.disguise.LibsDisguises; +//import me.libraryaddict.disguise.DisguiseAPI; import me.totalfreedom.totalfreedommod.FreedomService; import me.totalfreedom.totalfreedommod.TotalFreedomMod; import me.totalfreedom.totalfreedommod.util.FLog; @@ -13,7 +13,7 @@ import org.bukkit.plugin.Plugin; public class LibsDisguisesBridge extends FreedomService { - private LibsDisguises libsDisguisesPlugin = null; + // private LibsDisguises libsDisguisesPlugin = null; public LibsDisguisesBridge(TotalFreedomMod plugin) { @@ -29,7 +29,7 @@ public class LibsDisguisesBridge extends FreedomService protected void onStop() { } - +/* public LibsDisguises getLibsDisguisesPlugin() { if (libsDisguisesPlugin == null) @@ -134,7 +134,5 @@ public class LibsDisguisesBridge extends FreedomService } return ld.isEnabled(); - } -} - -*/ \ No newline at end of file + }*/ +} \ No newline at end of file diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_disguisetoggle.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_disguisetoggle.java index eafacaab..ac31a704 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_disguisetoggle.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_disguisetoggle.java @@ -1,6 +1,6 @@ package me.totalfreedom.totalfreedommod.command; -import me.libraryaddict.disguise.DisallowedDisguises; +//import me.libraryaddict.disguise.DisallowedDisguises; import me.totalfreedom.totalfreedommod.rank.Rank; import me.totalfreedom.totalfreedommod.util.FUtil; import org.bukkit.command.Command; @@ -15,7 +15,7 @@ public class Command_disguisetoggle extends FreedomCommand @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) - { + {/* if (!plugin.ldb.isPluginEnabled()) { msg(ChatColor.RED + "LibsDisguises is not enabled."); @@ -38,5 +38,10 @@ public class Command_disguisetoggle extends FreedomCommand msg("Disguises are now " + (!DisallowedDisguises.disabled ? "enabled." : "disabled.")); return true; + +*/ + + msg("This command has been disabled for technical reasons. Contact a developer for additional information."); + return true; } } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_undisguiseall.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_undisguiseall.java index f0123d5a..b382ff78 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_undisguiseall.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_undisguiseall.java @@ -1,6 +1,6 @@ package me.totalfreedom.totalfreedommod.command; -import me.libraryaddict.disguise.DisallowedDisguises; +//import me.libraryaddict.disguise.DisallowedDisguises; import me.totalfreedom.totalfreedommod.rank.Rank; import me.totalfreedom.totalfreedommod.util.FUtil; import org.bukkit.command.Command; @@ -14,7 +14,7 @@ public class Command_undisguiseall extends FreedomCommand @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) - { + { /* if (!plugin.ldb.isPluginEnabled()) { msg("LibsDisguises is not enabled."); @@ -32,5 +32,10 @@ public class Command_undisguiseall extends FreedomCommand plugin.ldb.undisguiseAll(false); return true; + +*/ + + msg("This command has been disabled for technical reasons. Contact a developer for additional information."); + return true; } } From 655d7471dcf2073cfb87df7c3e533b2ed46f9b15 Mon Sep 17 00:00:00 2001 From: StevenLawson Date: Tue, 25 Jul 2017 21:07:22 -0400 Subject: [PATCH 12/12] Removed dependency to Craftbukkit and Spigot server code. This breaks whitelist and onlinemode toggle. --- pom.xml | 45 ++++---- .../totalfreedommod/LoginProcess.java | 18 ++-- .../totalfreedommod/ServerInterface.java | 101 ++++++++---------- .../totalfreedommod/ServerPing.java | 3 +- .../command/Command_onlinemode.java | 42 ++++---- .../command/Command_whitelist.java | 6 +- 6 files changed, 106 insertions(+), 109 deletions(-) diff --git a/pom.xml b/pom.xml index b07aaaca..2b392006 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ UTF-8 ${project.version} Electrum - + ${maven.build.timestamp} ${buildAuthor} ${buildHead} @@ -54,10 +54,10 @@ spigot-repo https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - + sk89q-snapshots http://maven.sk89q.com/artifactory/repo @@ -65,6 +65,17 @@ + + org.apache.commons + commons-lang3 + 3.6 + + + + commons-io + commons-io + 2.5 + org.projectlombok @@ -74,8 +85,9 @@ org.spigotmc - spigot - 1.12-R0.1-SNAPSHOT + spigot-api + 1.12-pre5-SNAPSHOT + compile @@ -90,6 +102,12 @@ 4.5-pre1 + + net.ess3 + Essentials + 2.13.1 + + com.github.TotalFreedom.TF-WorldEdit worldedit-bukkit @@ -102,23 +120,6 @@ 6.1.0-TF - - org.bukkit - craftbukkit - 1.12-R0.1-SNAPSHOT - - - - net.ess3 - Essentials - 2.13.1 - - - diff --git a/src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java b/src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java index 9efa98e3..67469bdf 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java @@ -168,15 +168,15 @@ public class LoginProcess extends FreedomService return; } - // Whitelist - if (plugin.si.isWhitelisted()) - { - if (!plugin.si.getWhitelisted().contains(username.toLowerCase())) - { - event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "You are not whitelisted on this server."); - return; - } - } +// // Whitelist +// if (plugin.si.isWhitelisted()) +// { +// if (!plugin.si.getWhitelisted().contains(username.toLowerCase())) +// { +// event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "You are not whitelisted on this server."); +// return; +// } +// } } @EventHandler(priority = EventPriority.MONITOR) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java b/src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java index d050790c..90df9edf 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java @@ -1,14 +1,7 @@ package me.totalfreedom.totalfreedommod; -import java.util.Arrays; -import java.util.List; import me.totalfreedom.totalfreedommod.util.FLog; import me.totalfreedom.totalfreedommod.util.FUtil; -import net.minecraft.server.v1_12_R1.EntityPlayer; -import net.minecraft.server.v1_12_R1.MinecraftServer; -import net.minecraft.server.v1_12_R1.PropertyManager; -import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_12_R1.CraftServer; public class ServerInterface extends FreedomService { @@ -41,52 +34,52 @@ public class ServerInterface extends FreedomService } } - public void setOnlineMode(boolean mode) - { - final PropertyManager manager = getServer().getPropertyManager(); - manager.setProperty("online-mode", mode); - manager.savePropertiesFile(); - } - - public int purgeWhitelist() - { - String[] whitelisted = getServer().getPlayerList().getWhitelisted(); - int size = whitelisted.length; - for (EntityPlayer player : getServer().getPlayerList().players) - { - getServer().getPlayerList().getWhitelist().remove(player.getProfile()); - } - - try - { - getServer().getPlayerList().getWhitelist().save(); - } - catch (Exception ex) - { - FLog.warning("Could not purge the whitelist!"); - FLog.warning(ex); - } - return size; - } - - public boolean isWhitelisted() - { - return getServer().getPlayerList().getHasWhitelist(); - } - - public List getWhitelisted() - { - return Arrays.asList(getServer().getPlayerList().getWhitelisted()); - } - - public String getVersion() - { - return getServer().getVersion(); - } - - private MinecraftServer getServer() - { - return ((CraftServer) Bukkit.getServer()).getServer(); - } +// public void setOnlineMode(boolean mode) +// { +// final PropertyManager manager = getServer().getPropertyManager(); +// manager.setProperty("online-mode", mode); +// manager.savePropertiesFile(); +// } +// +// public int purgeWhitelist() +// { +// String[] whitelisted = getServer().getPlayerList().getWhitelisted(); +// int size = whitelisted.length; +// for (EntityPlayer player : getServer().getPlayerList().players) +// { +// getServer().getPlayerList().getWhitelist().remove(player.getProfile()); +// } +// +// try +// { +// getServer().getPlayerList().getWhitelist().save(); +// } +// catch (Exception ex) +// { +// FLog.warning("Could not purge the whitelist!"); +// FLog.warning(ex); +// } +// return size; +// } +// +// public boolean isWhitelisted() +// { +// return getServer().getPlayerList().getHasWhitelist(); +// } +// +// public List getWhitelisted() +// { +// return Arrays.asList(getServer().getPlayerList().getWhitelisted()); +// } +// +// public String getVersion() +// { +// return getServer().getVersion(); +// } +// +// private MinecraftServer getServer() +// { +// return ((CraftServer) Bukkit.getServer()).getServer(); +// } } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/ServerPing.java b/src/main/java/me/totalfreedom/totalfreedommod/ServerPing.java index 1c500838..8bd6748f 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/ServerPing.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/ServerPing.java @@ -55,7 +55,8 @@ public class ServerPing extends FreedomService return; } - String baseMotd = ConfigEntry.SERVER_MOTD.getString().replace("%mcversion%", plugin.si.getVersion()); +// String baseMotd = ConfigEntry.SERVER_MOTD.getString().replace("%mcversion%", plugin.si.getVersion()); + String baseMotd = ConfigEntry.SERVER_MOTD.getString(); baseMotd = baseMotd.replace("\\n", "\n"); baseMotd = FUtil.colorize(baseMotd); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_onlinemode.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_onlinemode.java index df6884e1..199f8e8f 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_onlinemode.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_onlinemode.java @@ -1,7 +1,6 @@ package me.totalfreedom.totalfreedommod.command; import me.totalfreedom.totalfreedommod.rank.Rank; -import me.totalfreedom.totalfreedommod.util.FLog; import me.totalfreedom.totalfreedommod.util.FUtil; import org.bukkit.ChatColor; import org.bukkit.command.Command; @@ -44,26 +43,27 @@ public class Command_onlinemode extends FreedomCommand return false; } - try - { - plugin.si.setOnlineMode(onlineMode); - - if (onlineMode) - { - for (Player player : server.getOnlinePlayers()) - { - player.kickPlayer("Server is activating \"online-mode=true\". Please reconnect."); - } - } - - FUtil.adminAction(sender.getName(), "Turning player validation " + (onlineMode ? "on" : "off") + ".", true); - - server.reload(); - } - catch (Exception ex) - { - FLog.severe(ex); - } +// try +// { +// plugin.si.setOnlineMode(onlineMode); +// +// if (onlineMode) +// { +// for (Player player : server.getOnlinePlayers()) +// { +// player.kickPlayer("Server is activating \"online-mode=true\". Please reconnect."); +// } +// } +// +// FUtil.adminAction(sender.getName(), "Turning player validation " + (onlineMode ? "on" : "off") + ".", true); +// +// server.reload(); +// } +// catch (Exception ex) +// { +// FLog.severe(ex); +// } + FUtil.adminAction(sender.getName(), "Online-Mode toggling is temporarily disabled.", true); } return true; diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_whitelist.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_whitelist.java index e8cc7dc2..fe8cc084 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_whitelist.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_whitelist.java @@ -158,8 +158,10 @@ public class Command_whitelist extends FreedomCommand //purge if (args[0].equalsIgnoreCase("purge")) { - FUtil.adminAction(sender.getName(), "Removing all players from the whitelist.", false); - msg("Removed " + plugin.si.purgeWhitelist() + " players from the whitelist."); +// FUtil.adminAction(sender.getName(), "Removing all players from the whitelist.", false); +// msg("Removed " + plugin.si.purgeWhitelist() + " players from the whitelist."); + + FUtil.adminAction(sender.getName(), "Whitelist purging is temporarily disabled.", true); return true; }