From ca4e64cc0ecf6a98c4a1cb9b514daf1942084a0d Mon Sep 17 00:00:00 2001 From: Steven Lawson Date: Thu, 20 Dec 2012 21:33:22 -0500 Subject: [PATCH] Updates for CraftBukkit v1.4.6 --- .../Commands/Command_saconfig.java | 2 +- .../Listener/TFM_BlockListener.java | 44 +++++++++---------- .../TotalFreedomMod/TFM_ServerInterface.java | 38 ++++++++-------- 3 files changed, 41 insertions(+), 43 deletions(-) diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java index fc624376..252e5996 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java @@ -75,7 +75,7 @@ public class Command_saconfig extends TFM_Command } else { - sender.sendMessage(ChatColor.stripColor(ChatColor.translateAlternateColorCodes('&', superadmin.toString()))); + sender.sendMessage(ChatColor.GRAY + ChatColor.stripColor(ChatColor.translateAlternateColorCodes('&', superadmin.toString()))); } return true; diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java index c32bf029..d2b9142c 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java @@ -163,8 +163,7 @@ public class TFM_BlockListener implements Listener } } - ItemStack is = new ItemStack(event.getBlockPlaced().getType(), 1, (short) 0, event.getBlockPlaced().getData()); - switch (is.getType()) + switch (event.getBlockPlaced().getType()) { case LAVA: case STATIONARY_LAVA: @@ -251,25 +250,24 @@ public class TFM_BlockListener implements Listener event.setCancelled(true); } } - - //This event is not in the standard Bukkit / CraftBukkit server, only my custom version. Remove it if you want to compile this plugin yourself. - @EventHandler(priority = EventPriority.NORMAL) - public void onCommandBlockChangeEvent(CommandBlockChangeEvent event) - { - Player player = event.getPlayer(); - - if (!TFM_SuperadminList.isUserSuperadmin(player)) - { - TFM_Util.playerMsg(player, "You do not have permission to set Command Block commands."); - event.setCancelled(true); - return; - } - - if (!TFM_SuperadminList.isSeniorAdmin(player)) - { - TFM_Util.playerMsg(player, "You do not have permission to set Command Block commands."); - event.setCancelled(true); - return; - } - } + +// @EventHandler(priority = EventPriority.NORMAL) +// public void onCommandBlockChangeEvent(CommandBlockChangeEvent event) +// { +// Player player = event.getPlayer(); +// +// if (!TFM_SuperadminList.isUserSuperadmin(player)) +// { +// TFM_Util.playerMsg(player, "You do not have permission to set Command Block commands."); +// event.setCancelled(true); +// return; +// } +// +// if (!TFM_SuperadminList.isSeniorAdmin(player)) +// { +// TFM_Util.playerMsg(player, "You do not have permission to set Command Block commands."); +// event.setCancelled(true); +// return; +// } +// } } diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java b/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java index a2580d75..1db443c2 100644 --- a/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java +++ b/src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java @@ -5,11 +5,11 @@ import java.util.Date; import java.util.Iterator; import java.util.Set; import java.util.regex.Pattern; -import net.minecraft.server.v1_4_5.BanEntry; -import net.minecraft.server.v1_4_5.BanList; -import net.minecraft.server.v1_4_5.MinecraftServer; -import net.minecraft.server.v1_4_5.PropertyManager; -import net.minecraft.server.v1_4_5.ServerConfigurationManagerAbstract; +import net.minecraft.server.v1_4_6.BanEntry; +import net.minecraft.server.v1_4_6.BanList; +import net.minecraft.server.v1_4_6.MinecraftServer; +import net.minecraft.server.v1_4_6.PlayerList; +import net.minecraft.server.v1_4_6.PropertyManager; import org.bukkit.ChatColor; import org.bukkit.Server; import org.bukkit.entity.Player; @@ -28,14 +28,14 @@ public class TFM_ServerInterface public static void wipeNameBans() { - BanList nameBans = MinecraftServer.getServer().getServerConfigurationManager().getNameBans(); + BanList nameBans = MinecraftServer.getServer().getPlayerList().getNameBans(); nameBans.getEntries().clear(); nameBans.save(); } public static void wipeIpBans() { - BanList IPBans = MinecraftServer.getServer().getServerConfigurationManager().getIPBans(); + BanList IPBans = MinecraftServer.getServer().getPlayerList().getIPBans(); IPBans.getEntries().clear(); IPBans.save(); } @@ -43,7 +43,7 @@ public class TFM_ServerInterface public static void unbanUsername(String name) { name = name.toLowerCase().trim(); - BanList nameBans = MinecraftServer.getServer().getServerConfigurationManager().getNameBans(); + BanList nameBans = MinecraftServer.getServer().getPlayerList().getNameBans(); nameBans.remove(name); } @@ -63,14 +63,14 @@ public class TFM_ServerInterface { ban_entry.setSource(source); } - BanList nameBans = MinecraftServer.getServer().getServerConfigurationManager().getNameBans(); + BanList nameBans = MinecraftServer.getServer().getPlayerList().getNameBans(); nameBans.add(ban_entry); } public static boolean isNameBanned(String name) { name = name.toLowerCase().trim(); - BanList nameBans = MinecraftServer.getServer().getServerConfigurationManager().getNameBans(); + BanList nameBans = MinecraftServer.getServer().getPlayerList().getNameBans(); nameBans.removeExpired(); return nameBans.getEntries().containsKey(name); } @@ -91,21 +91,21 @@ public class TFM_ServerInterface { ban_entry.setSource(source); } - BanList ipBans = MinecraftServer.getServer().getServerConfigurationManager().getIPBans(); + BanList ipBans = MinecraftServer.getServer().getPlayerList().getIPBans(); ipBans.add(ban_entry); } public static void unbanIP(String ip) { ip = ip.toLowerCase().trim(); - BanList ipBans = MinecraftServer.getServer().getServerConfigurationManager().getIPBans(); + BanList ipBans = MinecraftServer.getServer().getPlayerList().getIPBans(); ipBans.remove(ip); } public static boolean isIPBanned(String ip) { ip = ip.toLowerCase().trim(); - BanList ipBans = MinecraftServer.getServer().getServerConfigurationManager().getIPBans(); + BanList ipBans = MinecraftServer.getServer().getPlayerList().getIPBans(); ipBans.removeExpired(); return ipBans.getEntries().containsKey(ip); } @@ -113,7 +113,7 @@ public class TFM_ServerInterface @SuppressWarnings("rawtypes") public static int purgeWhitelist() { - Set whitelisted = MinecraftServer.getServer().getServerConfigurationManager().getWhitelisted(); + Set whitelisted = MinecraftServer.getServer().getPlayerList().getWhitelisted(); int size = whitelisted.size(); whitelisted.clear(); return size; @@ -126,9 +126,9 @@ public class TFM_ServerInterface final Server server = TotalFreedomMod.plugin.getServer(); - final ServerConfigurationManagerAbstract scm = MinecraftServer.getServer().getServerConfigurationManager(); - final BanList banByIP = scm.getIPBans(); - final BanList banByName = scm.getNameBans(); + final PlayerList player_list = MinecraftServer.getServer().getPlayerList(); + final BanList banByIP = player_list.getIPBans(); + final BanList banByName = player_list.getNameBans(); final Player p = event.getPlayer(); @@ -253,9 +253,9 @@ public class TFM_ServerInterface return; } - if (scm.hasWhitelist) + if (player_list.hasWhitelist) { - if (!scm.getWhitelisted().contains(player_name.toLowerCase())) + if (!player_list.getWhitelisted().contains(player_name.toLowerCase())) { event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "You are not whitelisted on this server."); return;