From b7ab9e7904aa3d6739c859f22d4f0a42fbe6f00b Mon Sep 17 00:00:00 2001
From: adabugra <57899270+adabugra@users.noreply.github.com>
Date: Tue, 1 Aug 2023 16:39:21 +0300
Subject: [PATCH] add op check

---
 .../PlayerEntersIntoTownBorderListener.java   | 56 ++++++++++---------
 .../PlayerExitsFromTownBorderListener.java    | 35 +++++++-----
 2 files changed, 50 insertions(+), 41 deletions(-)

diff --git a/src/main/java/me/adabugra/TownyBlockBugFix/PlayerEntersIntoTownBorderListener.java b/src/main/java/me/adabugra/TownyBlockBugFix/PlayerEntersIntoTownBorderListener.java
index 06ce894..b8918e1 100644
--- a/src/main/java/me/adabugra/TownyBlockBugFix/PlayerEntersIntoTownBorderListener.java
+++ b/src/main/java/me/adabugra/TownyBlockBugFix/PlayerEntersIntoTownBorderListener.java
@@ -1,26 +1,30 @@
-package me.adabugra.TownyBlockBugFix;
-
-import com.palmergames.bukkit.towny.TownyAPI;
-import com.palmergames.bukkit.towny.event.player.PlayerEntersIntoTownBorderEvent;
-import com.palmergames.bukkit.towny.object.Resident;
-import com.palmergames.bukkit.towny.object.Town;
-import org.bukkit.Bukkit;
-import org.bukkit.GameMode;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-
-public class PlayerEntersIntoTownBorderListener implements Listener {
-    @EventHandler
-    public void onPlayerEntersIntoTownBorder(PlayerEntersIntoTownBorderEvent event) {
-        Player player = event.getPlayer();
-        Town town = event.getEnteredTown();
-        Resident resident = TownyAPI.getInstance().getResident(player);
-        if(resident.hasTown() && resident.getTownOrNull().equals(town)) {
-            return;
-        }else{
-            player.setGameMode(GameMode.ADVENTURE);
-        }
-    }
-
-}
+package me.adabugra.TownyBlockBugFix;
+
+import com.palmergames.bukkit.towny.TownyAPI;
+import com.palmergames.bukkit.towny.event.player.PlayerEntersIntoTownBorderEvent;
+import com.palmergames.bukkit.towny.object.Resident;
+import com.palmergames.bukkit.towny.object.Town;
+import org.bukkit.Bukkit;
+import org.bukkit.GameMode;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+
+public class PlayerEntersIntoTownBorderListener implements Listener {
+    @EventHandler
+    public void onPlayerEntersIntoTownBorder(PlayerEntersIntoTownBorderEvent event) {
+        Player player = event.getPlayer();
+        Town town = event.getEnteredTown();
+        Resident resident = TownyAPI.getInstance().getResident(player);
+        if(resident.hasTown() && resident.getTownOrNull().equals(town)) {
+            return;
+        }else{
+            if(player.isOp()){
+                return;
+
+            }
+            player.setGameMode(GameMode.ADVENTURE);
+        }
+    }
+
+}
diff --git a/src/main/java/me/adabugra/TownyBlockBugFix/PlayerExitsFromTownBorderListener.java b/src/main/java/me/adabugra/TownyBlockBugFix/PlayerExitsFromTownBorderListener.java
index a93bfbb..e319c27 100644
--- a/src/main/java/me/adabugra/TownyBlockBugFix/PlayerExitsFromTownBorderListener.java
+++ b/src/main/java/me/adabugra/TownyBlockBugFix/PlayerExitsFromTownBorderListener.java
@@ -1,16 +1,21 @@
-package me.adabugra.TownyBlockBugFix;
-
-import com.palmergames.bukkit.towny.event.player.PlayerExitsFromTownBorderEvent;
-import org.bukkit.GameMode;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-
-public class PlayerExitsFromTownBorderListener implements Listener {
-    @EventHandler
-    public void onPlayerExitsFromTownBorderEvent(PlayerExitsFromTownBorderEvent event) {
-        Player player = event.getPlayer();
-        player.setGameMode(GameMode.SURVIVAL);
-    }
-
+package me.adabugra.TownyBlockBugFix;
+
+import com.palmergames.bukkit.towny.event.player.PlayerExitsFromTownBorderEvent;
+import org.bukkit.GameMode;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+
+public class PlayerExitsFromTownBorderListener implements Listener {
+    @EventHandler
+    public void onPlayerExitsFromTownBorderEvent(PlayerExitsFromTownBorderEvent event) {
+
+        Player player = event.getPlayer();
+        if (player.isOp()) {
+            return;
+        } else {
+            player.setGameMode(GameMode.SURVIVAL);
+        }
+
+    }
 }
\ No newline at end of file