From 72fa8532d3a05786884f826d7184a4a0debf415f Mon Sep 17 00:00:00 2001 From: Drew Date: Mon, 2 Mar 2015 20:26:43 -0600 Subject: [PATCH 1/3] Blocked pending commands in CommandBlocker. Resolves #492 --- src/config.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/config.yml b/src/config.yml index ed86f51a..29801869 100644 --- a/src/config.yml +++ b/src/config.yml @@ -117,6 +117,12 @@ blocked_commands: - 's:b:/setidletimeout:_' - 's:b:/mail sendall:_' - 's:b:/eco reset:_' + - 's:b:/mask:_' + - 's:b:/gmask:_' + - 's:b:/tool:_' + - 's:b:/lrbuild:_' + - 's:b:/defaultgamemode:_' + # Superadmin commands - Auto-eject - 's:a:/stop:_' From a15e39d7dd696e1f61fe3da504272a09657fc5f2 Mon Sep 17 00:00:00 2001 From: "John J. Miller" Date: Mon, 23 Mar 2015 16:14:53 -0400 Subject: [PATCH 2/3] Added more announcements. Resolves #516 --- src/config.yml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/config.yml b/src/config.yml index 29801869..3ea436e8 100644 --- a/src/config.yml +++ b/src/config.yml @@ -212,7 +212,26 @@ announcer: announcements: - 'Be sure to visit our forums at &6http://totalfreedom.boards.net/' - 'You can always review the server rules here: &6http://totalfreedom.me/' - - 'If you aren''t OP, be sure to ask!' + - 'If you are not OP, be sure to ask!' + - 'Somebody breaking the rules? Report it! /report ' + - 'Griefing is not allowed!' + - 'Hacking is allowed!' + - 'Interested in becoming admin? Do "/ai" for more information!' + - 'You may view all online administrators via "/list -a"' + - 'Save your buildings via WorldEdit! http://totalfreedom.me for more information!' + - 'Famous players, such as Notch, are always fake! We are an offline/cracked server!' + - 'You may contact TotalFreedoms Support on Twitter! pravi.us/nGS' + - 'You may download TotalFreedomMod here: pravi.us/V8c' + - 'MarkByron is TotalFreedoms owner.' + - 'Server lagging? Check the lag via "/tps"' + - 'You are allowed to record and stream videos on TotalFreedom :D' + - 'An admin abusing? Report it! pravi.us/vfa' + - 'Player vs Player while in creative/god mode it forbidden!' + - 'Spawn killing is forbidden!' + - 'Invisible potions are allowed!' + - 'Serial griefing and trolling will result in permanently being banned!' + - 'TotalFreedom does not accept any form of donations!' + - 'Racism, Nazism, and Sexism is strictly forbidden!' # Players who cannot be banned by username unbannable_usernames: From aacf37aa565617f05d79dc04537fdb7596428059 Mon Sep 17 00:00:00 2001 From: Jerom van der Sar Date: Sun, 26 Apr 2015 20:43:37 +0200 Subject: [PATCH 3/3] Update to Spigot 1.8.3-R2 --- buildnumber.properties | 4 ++-- .../TotalFreedomMod/TFM_ServerInterface.java | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/buildnumber.properties b/buildnumber.properties index 70d472a8..4386d4a8 100644 --- a/buildnumber.properties +++ b/buildnumber.properties @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Mon Feb 16 16:40:10 CET 2015 -build.number=982 +#Sun Apr 26 20:42:55 CEST 2015 +build.number=983 diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java b/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java index 3ef70126..c96b9158 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java @@ -5,8 +5,9 @@ import java.util.List; import java.util.UUID; import java.util.regex.Pattern; import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry; -import net.minecraft.server.v1_8_R1.MinecraftServer; -import net.minecraft.server.v1_8_R1.PropertyManager; +import net.minecraft.server.v1_8_R2.EntityPlayer; +import net.minecraft.server.v1_8_R2.MinecraftServer; +import net.minecraft.server.v1_8_R2.PropertyManager; import org.bukkit.ChatColor; import org.bukkit.Server; import org.bukkit.entity.Player; @@ -29,9 +30,8 @@ public class TFM_ServerInterface { String[] whitelisted = MinecraftServer.getServer().getPlayerList().getWhitelisted(); int size = whitelisted.length; - for (String player : MinecraftServer.getServer().getPlayerList().getWhitelist().getEntries()) - { - MinecraftServer.getServer().getPlayerList().getWhitelist().remove(player); + for (EntityPlayer player : MinecraftServer.getServer().getPlayerList().players) { + MinecraftServer.getServer().getPlayerList().getWhitelist().remove(player.getProfile()); } try @@ -48,7 +48,7 @@ public class TFM_ServerInterface public static boolean isWhitelisted() { - return MinecraftServer.getServer().getPlayerList().hasWhitelist; + return MinecraftServer.getServer().getPlayerList().getHasWhitelist(); } public static List getWhitelisted()