adding bypass perms for kick and deny (by Aenoxic)

src/main/java/tim03we/futureplots/FuturePlots.java

@@ -91,7 +91,7 @@ private void registerEvents() {
     }
 
     private void checkVersion() {
-        if(!Language.getNoPrefix("version").equals("1.2.7")) {
+        if(!Language.getNoPrefix("version").equals("1.2.8")) {
             new File(getDataFolder() + "/lang/" + Settings.language + "_old.yml").delete();
             if(new File(getDataFolder() + "/lang/" + Settings.language + ".yml").renameTo(new File(getDataFolder() + "/lang/" + Settings.language + "_old.yml"))) {
                 getLogger().critical("The version of the language configuration does not match. You will find the old file marked \"" + Settings.language + "_old.yml\" in the same language directory.");
@@ -203,7 +203,7 @@ public void generateLevel(String levelName) {
     public void clearEntities(Plot plot) {
         for (Entity entity : getServer().getLevelByName(plot.getLevelName()).getEntities()) {
             if (!(entity instanceof Player)) {
-                if (entity != null) {
+                if (entity != null && entity.getLocation() != null) {
                     if (getPlotByPosition(entity.getLocation()).getX() == plot.getX() && getPlotByPosition(entity.getLocation()).getZ() == plot.getZ() && getPlotByPosition(entity.getLocation()).getLevelName().equals(plot.getLevelName())) {
                         entity.close();
                     }

src/main/java/tim03we/futureplots/commands/sub/DenyCommand.java

@@ -17,6 +17,7 @@
  */
 
 import cn.nukkit.Player;
+import cn.nukkit.Server;
 import cn.nukkit.command.CommandSender;
 import tim03we.futureplots.FuturePlots;
 import tim03we.futureplots.commands.BaseCommand;
@@ -37,8 +38,13 @@ public void execute(CommandSender sender, String command, String[] args) {
                 if(plot.canByPass((Player) sender)) {
                     if (args.length > 1) {
                         if (!FuturePlots.provider.isDenied(args[1], plot)) {
-                            FuturePlots.provider.addDenied(args[1], plot);
-                            sender.sendMessage(translate(true, "deny.added", args[1].toLowerCase()));
+                            Player target = Server.getInstance().getPlayer(args[1]);
+                            if (target.hasPermission("plot.deny.bypass")) {
+                                sender.sendMessage(translate(true, "deny.bypass.notallowed"));
+                            } else {
+                                FuturePlots.provider.addDenied(args[1], plot);
+                                sender.sendMessage(translate(true, "deny.added", args[1].toLowerCase()));
+                            }
                         } else {
                             sender.sendMessage(translate(true, "deny.exists"));
                         }

src/main/java/tim03we/futureplots/commands/sub/KickCommand.java

@@ -40,9 +40,13 @@ public void execute(CommandSender sender, String command, String[] args) {
                         if(target != null) {
                             Plot tpp = new PlotPlayer(target).getPlot();
                             if(tpp != null && tpp.getX() == plot.getX() && tpp.getZ() == plot.getZ() && tpp.getLevelName().equals(plot.getLevelName())) {
-                                sender.sendMessage(translate(true, "plot.kick", target.getName()));
-                                target.sendMessage(translate(true, "plot.kick.target"));
-                                target.teleport(Server.getInstance().getDefaultLevel().getSafeSpawn());
+                                if (target.hasPermission("plot.kick.bypass")) {
+                                    sender.sendMessage(translate(true, "plot.kick.notallowed"));
+                                } else {
+                                    sender.sendMessage(translate(true, "plot.kick", target.getName()));
+                                    target.sendMessage(translate(true, "plot.kick.target"));
+                                    target.teleport(Server.getInstance().getDefaultLevel().getSafeSpawn());
+                                }
                             } else {
                                 sender.sendMessage(translate(true, "plot.kick.error"));
                             }

src/main/resources/lang/chs.yml

@@ -1,5 +1,5 @@
 ---
-version: "1.2.7"
+version: "1.2.8"
 
 prefix: "FuturePlots >汉化by从不咕咕的鸽纸 "
 
@@ -30,6 +30,7 @@ plot.dispose: "这个地皮被上锁了."
 plot.kick: "你将玩家 %1 踢出了地皮."
 plot.kick.target: "这个地皮的拥有者将你踢出了地皮."
 plot.kick.error: "这个玩家不在这个地皮中."
+plot.kick.bypass.notallowed: "这个玩家不能被踢出剧情。."
 plot.setowner: "你给的情节%1。"
 plot.setowner.target: "您已收到ID为%1的绘图."
 plot.setowner.target.max: "这个玩家已经达到了最大的地块数."
@@ -47,6 +48,7 @@ deny.added: "玩家 %1 被禁止进入这个地皮了."
 deny.removed: "玩家 %1 现在可以进入你的地皮了."
 deny.exists: "这个玩家已经禁止进入这个地皮了."
 deny.not.exists: "这个玩家可以进入这个地皮了."
+deny.bypass.notallowed: "这名球员不能被禁止入内。."
 
 member.added: "成员 %1 被添加到了该地皮."
 member.removed: "成员 %1 从该地皮中被移除了."

src/main/resources/lang/deu.yml

@@ -1,5 +1,5 @@
 ---
-version: "1.2.7"
+version: "1.2.8"
 
 prefix: "FuturePlots > "
 
@@ -30,6 +30,7 @@ plot.dispose: "Das Plot wurde freigegeben."
 plot.kick: "Du hast den Spieler %1 vom Plot geschmissen."
 plot.kick.target: "Der Besitzer hat dich vom Plot geschmissen."
 plot.kick.error: "Dieser Spieler befindet sich nicht auf dem Plot."
+plot.kick.bypass.notallowed: "Dieser Spieler kann nicht vom Plot gekickt werden."
 plot.setowner: "Du hast das Plot %1 gegeben."
 plot.setowner.target: "Du hast das Plot mit der ID %1 erhalten."
 plot.setowner.target.max: "Dieser Spieler hat bereits das maximum an Plots erreicht."
@@ -47,6 +48,7 @@ deny.added: "Der Spieler %1 wurde vom Plot verbannt."
 deny.removed: "Der Spieler %1 kann das Plot nun wieder betreten."
 deny.exists: "Der Spieler ist bereits vom Plot verbannt."
 deny.not.exists: "Dieser Spieler wurde nicht vom Plot verbannt."
+deny.bypass.notallowed: "Dieser Spieler kann nicht vom Grundstück verbannt werden."
 
 member.added: "Der Spieler %1 wurde als Mitglied hinzugefügt."
 member.removed: "Der Spieler %1 wurde als Mitglied entfernt."

src/main/resources/lang/eng.yml

@@ -1,5 +1,5 @@
 ---
-version: "1.2.7"
+version: "1.2.8"
 
 prefix: "FuturePlots > "
 
@@ -30,6 +30,7 @@ plot.dispose: "The plot has been unlocked."
 plot.kick: "You threw player %1 off the plot."
 plot.kick.target: "The owner threw you off the plot."
 plot.kick.error: "This player is not on the plot."
+plot.kick.bypass.notallowed: "This player cannot be kicked from this plot."
 plot.setowner: "You gave the plot to %1."
 plot.setowner.target: "You were given the plot with the ID %1."
 plot.setowner.target.max: "This player already has the maximum number of plots."
@@ -47,6 +48,7 @@ deny.added: "The player %1 was banned from the plot."
 deny.removed: "The player %1 can now enter the plot again."
 deny.exists: "The player is already banned from the plot."
 deny.not.exists: "This player was not banned from the plot."
+deny.bypass.notallowed: "This player cannot be banned from this plot."
 
 member.added: "The member %1 was added to the plot."
 member.removed: "The member %1 was removed to the plot."

src/main/resources/lang/kor.yml

@@ -1,6 +1,6 @@
 ---
 # Korean Translation - good777LUCKY
-version: "1.2.7"
+version: "1.2.8"
 
 prefix: "FuturePlots > "
 
@@ -31,6 +31,7 @@ plot.dispose: "plot이 잠금 해제되었습니다."
 plot.kick: "당신은 플레이어 %1을(를) plot에서 내보냈습니다."
 plot.kick.target: "plot 소유자가 당신을 plot에서 내보냈습니다."
 plot.kick.error: "이 플레이어는 plot에 있지 않습니다."
+plot.kick.bypass.notallowed: "이 플레이어는 플롯에서 쫓겨날 수 없습니다."
 plot.setowner: "당신은 %1에 플롯을 주었다."
 plot.setowner.target: "ID %1이 있는 플롯이 주어졌습니다."
 plot.setowner.target.max: "이 플레이어는 이미 플롯의 최대 수를 가지고있다."
@@ -48,6 +49,7 @@ deny.added: "플레이어 %1(이)가 plot에서 금지되었습니다."
 deny.removed: "플레이어 %1(이)가 plot에 다시 들어갈 수 있습니다."
 deny.exists: "플레이어는 이미 plot에서 금지되어 있습니다."
 deny.not.exists: "이 플레이어는 plot에서 금지되지 않았습니다."
+deny.bypass.notallowed: "이 플레이어는 숙소에서 금지될 수 없습니다."
 
 member.added: "플레이어 %1(이)가 plot의 구성원으로 추가되었습니다."
 member.removed: "플레이어 %1(이)가 plot의 구성원에서 삭제되었습니다."