From 383a21ef7acb54ff1db794b26d0920d177f2131a Mon Sep 17 00:00:00 2001
From: TeamHR <92500115+TeamHRLive@users.noreply.github.com>
Date: Fri, 1 Mar 2024 10:50:42 +0530
Subject: [PATCH 1/2] [Fixed] Player's /is settings was not saving. [Fixed] Ops
were not able to fly on ISLAND unless /GMC. Now They can still fly if Fly
upgrade is disabled.
---
pom.xml | 21 ++++++++++++++++++-
.../skyblock/api/island/IslandManager.java | 2 +-
.../com/craftaro/skyblock/island/Island.java | 10 ++++-----
.../skyblock/island/IslandManager.java | 6 ++----
4 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index cafcea30..f74f932e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,7 @@
org.spigotmc
- spigot
+ spigot-api
1.20.1-R0.1-SNAPSHOT
provided
@@ -198,6 +198,25 @@
7.2.18
provided
+
+
+ com.mojang
+ authlib
+ 3.16.29
+ provided
+
+
+
+ io.netty
+ netty-all
+ 4.1.107.Final
+
+
+
+ commons-lang
+ commons-lang
+ 2.6
+
com.eatthepath
diff --git a/src/main/java/com/craftaro/skyblock/api/island/IslandManager.java b/src/main/java/com/craftaro/skyblock/api/island/IslandManager.java
index f0e91f78..f2a86400 100644
--- a/src/main/java/com/craftaro/skyblock/api/island/IslandManager.java
+++ b/src/main/java/com/craftaro/skyblock/api/island/IslandManager.java
@@ -112,7 +112,7 @@ public class IslandManager {
* @deprecated use {@link #updateFlight(Player)} instead
*/
@Deprecated
- public void giveUgrades(Player player, Island island) {
+ public void giveUpgrades(Player player, Island island) {
Preconditions.checkArgument(player != null, "Cannot give upgrades to null player");
Preconditions.checkArgument(island != null, "Cannot give upgrades to null island");
diff --git a/src/main/java/com/craftaro/skyblock/island/Island.java b/src/main/java/com/craftaro/skyblock/island/Island.java
index 9b1c0edd..3907cdd1 100644
--- a/src/main/java/com/craftaro/skyblock/island/Island.java
+++ b/src/main/java/com/craftaro/skyblock/island/Island.java
@@ -113,7 +113,7 @@ public class Island {
this.level = new IslandLevel(getOwnerUUID(), this.plugin);
- File configFile = new File(this.plugin.getDataFolder().toString() + "/island-data");
+ File configFile = new File(this.plugin.getDataFolder() + "/island-data");
Config config = fileManager.getConfig(new File(configFile, this.ownerUUID + ".yml"));
@@ -191,7 +191,7 @@ public class Island {
Config settingsDataConfig = null;
- File settingDataFile = new File(this.plugin.getDataFolder().toString() + "/setting-data", getOwnerUUID().toString() + ".yml");
+ File settingDataFile = new File(this.plugin.getDataFolder() + "/setting-data", getOwnerUUID().toString() + ".yml");
if (fileManager.isFileExist(settingDataFile)) {
settingsDataConfig = fileManager.getConfig(settingDataFile);
@@ -203,13 +203,13 @@ public class Island {
for (BasicPermission permission : allPermissions) {
if (settingsDataConfig == null || settingsDataConfig.getFileConfiguration()
- .getString("Settings." + roleList.getFriendlyName() + "." + permission.getName()) == null) {
+ .getString("Settings." + roleList.getFriendlyName().toUpperCase() + "." + permission.getName()) == null) {
permissions.add(
new IslandPermission(permission, this.plugin.getSettings()
- .getBoolean("Settings." + roleList.getFriendlyName() + "." + permission.getName(), true)));
+ .getBoolean("Settings." + roleList.getFriendlyName().toUpperCase() + "." + permission.getName(), true)));
} else {
permissions.add(new IslandPermission(permission, settingsDataConfig.getFileConfiguration()
- .getBoolean("Settings." + roleList.getFriendlyName() + "." + permission.getName(), true)));
+ .getBoolean("Settings." + roleList.getFriendlyName().toUpperCase() + "." + permission.getName(), true)));
}
}
diff --git a/src/main/java/com/craftaro/skyblock/island/IslandManager.java b/src/main/java/com/craftaro/skyblock/island/IslandManager.java
index 363f00eb..2581eb8e 100644
--- a/src/main/java/com/craftaro/skyblock/island/IslandManager.java
+++ b/src/main/java/com/craftaro/skyblock/island/IslandManager.java
@@ -1530,9 +1530,7 @@ public class IslandManager {
public void updateFlight(Player player) {
// The player can fly in other worlds if they are in creative or have another
// plugin's fly permission.
- if (player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR || player.hasPermission("essentials.fly") || player.hasPermission("cmi.command.fly")) {
- return;
- }
+ // Merged this with final if block as OPs were not able to fly.
// Residence support
if (Bukkit.getServer().getPluginManager().getPlugin("Residence") != null) {
@@ -1562,7 +1560,7 @@ public class IslandManager {
boolean hasGlobalFlyPermission = player.hasPermission("fabledskyblock.*") || player.hasPermission("fabledskyblock.fly.*");
boolean hasOwnIslandFlyPermission = player.hasPermission("fabledskyblock.fly") && island.getRole(player) != null && island.getRole(player) != IslandRole.VISITOR;
- if (hasGlobalFlyPermission || hasOwnIslandFlyPermission) {
+ if (hasGlobalFlyPermission || hasOwnIslandFlyPermission || player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR || player.hasPermission("essentials.fly") || player.hasPermission("cmi.command.fly")) {
WorldManager worldManager = this.plugin.getWorldManager();
boolean canFlyInWorld = worldManager.isIslandWorld(player.getWorld());
Bukkit.getServer().getScheduler().runTask(this.plugin, () -> player.setAllowFlight(canFlyInWorld));
From 9fe0fde5b2f58841077f3e5cb1f0fcead357d1af Mon Sep 17 00:00:00 2001
From: TeamHR
Date: Sat, 2 Mar 2024 20:21:45 +0530
Subject: [PATCH 2/2] [Fixes] /is settings not saving for player islands as
there is case mismatch. [Fixes] Operators/Players were not able to fly with
Island Fly Upgrade
---
pom.xml | 8 +++++---
.../com/craftaro/skyblock/api/island/IslandManager.java | 2 +-
.../java/com/craftaro/skyblock/island/IslandManager.java | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index f74f932e..158df5ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -198,24 +198,26 @@
7.2.18
provided
-
+
com.mojang
authlib
3.16.29
provided
-
+
io.netty
netty-all
4.1.107.Final
+ provided
-
+
commons-lang
commons-lang
2.6
+ compile
diff --git a/src/main/java/com/craftaro/skyblock/api/island/IslandManager.java b/src/main/java/com/craftaro/skyblock/api/island/IslandManager.java
index f2a86400..f0e91f78 100644
--- a/src/main/java/com/craftaro/skyblock/api/island/IslandManager.java
+++ b/src/main/java/com/craftaro/skyblock/api/island/IslandManager.java
@@ -112,7 +112,7 @@ public class IslandManager {
* @deprecated use {@link #updateFlight(Player)} instead
*/
@Deprecated
- public void giveUpgrades(Player player, Island island) {
+ public void giveUgrades(Player player, Island island) {
Preconditions.checkArgument(player != null, "Cannot give upgrades to null player");
Preconditions.checkArgument(island != null, "Cannot give upgrades to null island");
diff --git a/src/main/java/com/craftaro/skyblock/island/IslandManager.java b/src/main/java/com/craftaro/skyblock/island/IslandManager.java
index 2581eb8e..9348830b 100644
--- a/src/main/java/com/craftaro/skyblock/island/IslandManager.java
+++ b/src/main/java/com/craftaro/skyblock/island/IslandManager.java
@@ -1530,7 +1530,7 @@ public class IslandManager {
public void updateFlight(Player player) {
// The player can fly in other worlds if they are in creative or have another
// plugin's fly permission.
- // Merged this with final if block as OPs were not able to fly.
+
// Residence support
if (Bukkit.getServer().getPluginManager().getPlugin("Residence") != null) {