From 8ee3bc4a17d0830ac1ec6274f3f5f70b71125a99 Mon Sep 17 00:00:00 2001 From: kernitus <2789734+kernitus@users.noreply.github.com> Date: Tue, 11 Jul 2017 22:42:51 +0100 Subject: [PATCH] Removed some debug messages & fixed getting no permission message --- pom.xml | 2 +- src/main/java/gvlfm78/plugin/Hotels/Room.java | 7 ++++--- .../java/gvlfm78/plugin/Hotels/handlers/HTCmdExecutor.java | 2 +- .../gvlfm78/plugin/Hotels/handlers/HTCmdSurrogate.java | 4 ---- .../java/gvlfm78/plugin/Hotels/managers/HTSignManager.java | 3 +-- .../plugin/Hotels/managers/HTWorldGuardManager.java | 1 - src/main/resources/plugin.yml | 2 +- 7 files changed, 8 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 4e44e0b..c508953 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 me.kernitus hotels - 1.1.0 + 1.1.1 Hotels Hotels Bukkit/Spigot plugin https://github.com/kernitus/BukkitHotels diff --git a/src/main/java/gvlfm78/plugin/Hotels/Room.java b/src/main/java/gvlfm78/plugin/Hotels/Room.java index 6697c99..b46d31c 100644 --- a/src/main/java/gvlfm78/plugin/Hotels/Room.java +++ b/src/main/java/gvlfm78/plugin/Hotels/Room.java @@ -85,7 +85,7 @@ public OfflinePlayer getRenter(){ } public boolean isRenter(UUID uuid){ OfflinePlayer renter = getRenter(); - return renter==null ? false : renter.getUniqueId().equals(uuid); + return renter != null && renter.getUniqueId().equals(uuid); } public boolean isRented(){ return getRenter() != null; @@ -172,9 +172,10 @@ public long getRentTime(){ } public boolean isFree(){ OfflinePlayer renter = null; - if(exists() && getSignFile().exists()) //Check if region & file exist + if(exists() && doesSignFileExist()) //Check if region & file exist renter = getRenter(); - return renter==null || !renter.hasPlayedBefore(); + + return renter == null || !renter.hasPlayedBefore(); } public boolean isFreeOrNotSetup(){ return !getSignFile().exists() || isFree(); diff --git a/src/main/java/gvlfm78/plugin/Hotels/handlers/HTCmdExecutor.java b/src/main/java/gvlfm78/plugin/Hotels/handlers/HTCmdExecutor.java index fa8cc89..fd712ea 100644 --- a/src/main/java/gvlfm78/plugin/Hotels/handlers/HTCmdExecutor.java +++ b/src/main/java/gvlfm78/plugin/Hotels/handlers/HTCmdExecutor.java @@ -116,7 +116,7 @@ else if(pathToUsageToDisplay != null && !pathToUsageToDisplay.isEmpty()) //Unknown sub-command if(!matchedCommand){ Mes.mes(sender, "chat.commands.unknownArg"); return false; } - if(!noPermission){ Mes.mes(sender ,"chat.noPermission"); return false; } + if(noPermission){ Mes.mes(sender ,"chat.noPermission"); return false; } //Display command usage if(pathToUsageToDisplay != null && !pathToUsageToDisplay.isEmpty()){ diff --git a/src/main/java/gvlfm78/plugin/Hotels/handlers/HTCmdSurrogate.java b/src/main/java/gvlfm78/plugin/Hotels/handlers/HTCmdSurrogate.java index 36117e7..d544715 100644 --- a/src/main/java/gvlfm78/plugin/Hotels/handlers/HTCmdSurrogate.java +++ b/src/main/java/gvlfm78/plugin/Hotels/handlers/HTCmdSurrogate.java @@ -42,7 +42,6 @@ public static void cmdCommands(CommandSender s){ cmdCommands(s, !HTConfigHandler.getconfigYML().getBoolean("onlyDisplayAllowedCommands", true)); } public static void cmdCommands(CommandSender s, boolean skipPermissionChecks){ - System.out.print("skip? " + skipPermissionChecks); Mes.mesNoPrefix(s, "chat.commands.commands.header"); Mes.mesNoPrefix(s, "chat.commands.commands.subheader"); Mes.mesNoPrefix(s, "chat.commands.commands.help"); @@ -487,9 +486,6 @@ public static void cmdRenameHotel(CommandSender sender, Hotel hotel, String newN public static void cmdRemovePlayer(CommandSender sender, String playerName, String hotelName, String roomNum){ Room room = new Room(hotelName, roomNum, sender); - - System.out.println("ROOM world: " + room.getWorld()); - @SuppressWarnings("deprecation") OfflinePlayer player = Bukkit.getOfflinePlayer(playerName); diff --git a/src/main/java/gvlfm78/plugin/Hotels/managers/HTSignManager.java b/src/main/java/gvlfm78/plugin/Hotels/managers/HTSignManager.java index fc3ab7e..2aebbdd 100644 --- a/src/main/java/gvlfm78/plugin/Hotels/managers/HTSignManager.java +++ b/src/main/java/gvlfm78/plugin/Hotels/managers/HTSignManager.java @@ -229,9 +229,8 @@ public static void useRoomSign(PlayerInteractEvent e) { //Sign lines Sign s = (Sign) e.getClickedBlock().getState(); - String Line1 = ChatColor.stripColor(s.getLine(0)); //Line1 String Line2 = ChatColor.stripColor(s.getLine(1)); //Line2 - String hotelName = (ChatColor.stripColor(Line1)); //Hotel name + String hotelName = ChatColor.stripColor(s.getLine(0)); //Hotel name Hotel hotel = new Hotel(world, hotelName); diff --git a/src/main/java/gvlfm78/plugin/Hotels/managers/HTWorldGuardManager.java b/src/main/java/gvlfm78/plugin/Hotels/managers/HTWorldGuardManager.java index 00a619c..03e0749 100644 --- a/src/main/java/gvlfm78/plugin/Hotels/managers/HTWorldGuardManager.java +++ b/src/main/java/gvlfm78/plugin/Hotels/managers/HTWorldGuardManager.java @@ -108,7 +108,6 @@ public static void removeOwners(DefaultDomain dd, ProtectedRegion r){ public static void removeMember(UUID id, ProtectedRegion r){ DefaultDomain members = r.getMembers(); members.removePlayer(id); - System.out.println("Members: " + members.size() + " id: " + id.toString()); r.setMembers(members); } public static void removeMembers(DefaultDomain dd, ProtectedRegion r){ diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 5496342..1b8c116 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ main: kernitus.plugin.Hotels.HotelsMain name: Hotels -version: 1.1.0 +version: 1.1.1 author: kernitus description: Allows the making of hotels and renting of rooms. website: http://www.spigotmc.org/resources/hotels.2047/