From eb97f1e8fc62e29fb9f57c167630ed7560dfa1fc Mon Sep 17 00:00:00 2001 From: Xiao-MoMi <70987828+Xiao-MoMi@users.noreply.github.com> Date: Sun, 22 May 2022 19:46:48 +0800 Subject: [PATCH] no change --- .../momirealms/customcrops/Crops/TimeCheck.java | 4 ---- .../net/momirealms/customcrops/CustomCrops.java | 1 - .../momirealms/customcrops/DataManager/BackUp.java | 1 + .../customcrops/DataManager/CropManager.java | 14 ++------------ .../Integrations/KingdomsXIntegrations.java | 3 +++ .../Integrations/WorldGuardIntegrations.java | 10 ++-------- 6 files changed, 8 insertions(+), 25 deletions(-) diff --git a/src/main/java/net/momirealms/customcrops/Crops/TimeCheck.java b/src/main/java/net/momirealms/customcrops/Crops/TimeCheck.java index 9ce3bdc..5e3e508 100644 --- a/src/main/java/net/momirealms/customcrops/Crops/TimeCheck.java +++ b/src/main/java/net/momirealms/customcrops/Crops/TimeCheck.java @@ -18,8 +18,6 @@ import java.util.Objects; public class TimeCheck extends BukkitRunnable { - - @Override public void run() { long time = Bukkit.getWorld("world").getTime(); @@ -155,9 +153,7 @@ public class TimeCheck extends BukkitRunnable { private void waterPot(Location tempLoc, World world, FileConfiguration config) { if(CustomBlock.byAlreadyPlaced(world.getBlockAt(tempLoc)) != null){ if(CustomBlock.byAlreadyPlaced(world.getBlockAt(tempLoc)).getNamespacedID().equalsIgnoreCase(config.getString("config.pot"))){ - PacketContainer fakeWater = new PacketContainer(PacketType.Play.Server.ENTITY_HEAD_ROTATION); - Bukkit.getScheduler().callSyncMethod(CustomCrops.instance,()->{ CustomBlock.remove(tempLoc); CustomBlock.place(config.getString("config.watered-pot"), tempLoc); diff --git a/src/main/java/net/momirealms/customcrops/CustomCrops.java b/src/main/java/net/momirealms/customcrops/CustomCrops.java index ab17bb9..7debad0 100644 --- a/src/main/java/net/momirealms/customcrops/CustomCrops.java +++ b/src/main/java/net/momirealms/customcrops/CustomCrops.java @@ -57,7 +57,6 @@ public final class CustomCrops extends JavaPlugin { List components = packet.getChatComponents().getValues(); for (WrappedChatComponent component : components) { if(component.toString().contains("Ender Chest")){ - //component.setJson("{\"text\":\"收纳袋\"}"); component.setJson("{\"translate\":\"container.enderchest\"}"); packet.getChatComponents().write(components.indexOf(component), component); } diff --git a/src/main/java/net/momirealms/customcrops/DataManager/BackUp.java b/src/main/java/net/momirealms/customcrops/DataManager/BackUp.java index c1c5d35..3b07564 100644 --- a/src/main/java/net/momirealms/customcrops/DataManager/BackUp.java +++ b/src/main/java/net/momirealms/customcrops/DataManager/BackUp.java @@ -25,6 +25,7 @@ public class BackUp { BackUp.backUp(sprinkler_data,sprinklerBackUp); } catch (IOException e) { e.printStackTrace(); + CustomCrops.instance.getLogger().warning("备份发生错误"); } } diff --git a/src/main/java/net/momirealms/customcrops/DataManager/CropManager.java b/src/main/java/net/momirealms/customcrops/DataManager/CropManager.java index 9469ae5..a9a44d3 100644 --- a/src/main/java/net/momirealms/customcrops/DataManager/CropManager.java +++ b/src/main/java/net/momirealms/customcrops/DataManager/CropManager.java @@ -25,7 +25,7 @@ public class CropManager { CropManager.instances = new HashMap(); if(data.getConfigurationSection(world) != null){ for (String coordinate : data.getConfigurationSection(world).getKeys(false)) { - Location tempLocation = new Location(Bukkit.getWorld(world), (double)Integer.parseInt(coordinate.split(",")[0]), (double)Integer.parseInt(coordinate.split(",")[1]), (double)Integer.parseInt(coordinate.split(",")[2])); + Location tempLocation = new Location(Bukkit.getWorld(world), Integer.parseInt(coordinate.split(",")[0]), Integer.parseInt(coordinate.split(",")[1]), Integer.parseInt(coordinate.split(",")[2])); String season = data.getString(world + "." + coordinate); CropManager.instances.put(tempLocation, season); } @@ -84,20 +84,10 @@ public class CropManager { e.printStackTrace(); } } - //test - public static void testData(){ - for(int i = 1; i < 100000;i++){ - Location tempLoc = new Location(Bukkit.getWorld("world"),i,100,i); - String name = "1"; - instances.put(tempLoc, name); - } - } + public static void putInstance(Location location, String season) { CropManager.instances.put(location, season); } - public HashMap getMap() { - return CropManager.instances; - } //清理无效的农作物 public static void cleanLoadedCache() { diff --git a/src/main/java/net/momirealms/customcrops/Integrations/KingdomsXIntegrations.java b/src/main/java/net/momirealms/customcrops/Integrations/KingdomsXIntegrations.java index 1b28b70..685ba9d 100644 --- a/src/main/java/net/momirealms/customcrops/Integrations/KingdomsXIntegrations.java +++ b/src/main/java/net/momirealms/customcrops/Integrations/KingdomsXIntegrations.java @@ -11,6 +11,9 @@ public class KingdomsXIntegrations { KingdomPlayer kp = KingdomPlayer.getKingdomPlayer(player); Land land = Land.getLand(location); if (land == null) return false; + if (player.isOp()) { + return false; + } if (land.isClaimed()) { Kingdom cropKingdom = land.getKingdom(); if (kp.getKingdom() != null) { diff --git a/src/main/java/net/momirealms/customcrops/Integrations/WorldGuardIntegrations.java b/src/main/java/net/momirealms/customcrops/Integrations/WorldGuardIntegrations.java index e6e4fcb..663fb45 100644 --- a/src/main/java/net/momirealms/customcrops/Integrations/WorldGuardIntegrations.java +++ b/src/main/java/net/momirealms/customcrops/Integrations/WorldGuardIntegrations.java @@ -17,10 +17,7 @@ public class WorldGuardIntegrations { RegionContainer container = WorldGuard.getInstance().getPlatform().getRegionContainer(); RegionQuery query = container.createQuery(); - if (!query.testState(BukkitAdapter.adapt(loc), localPlayer, Flags.BUILD)) { - return true; - } - return false; + return !query.testState(BukkitAdapter.adapt(loc), localPlayer, Flags.BUILD); } public static boolean checkWGHarvest(Location loc,Player player){ @@ -28,9 +25,6 @@ public class WorldGuardIntegrations { RegionContainer container = WorldGuard.getInstance().getPlatform().getRegionContainer(); RegionQuery query = container.createQuery(); - if (!query.testState(BukkitAdapter.adapt(loc), localPlayer, Flags.BLOCK_BREAK)) { - return true; - } - return false; + return !query.testState(BukkitAdapter.adapt(loc), localPlayer, Flags.BLOCK_BREAK); } }