Merge pull request #152 from Nookure/dev

release
Nookure · Jan 10, 2025 · f149a6d · f149a6d
2 parents 408baec + 1857de7
commit f149a6d
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
diff --git a/...-Paper/src/main/java/com/nookure/staff/paper/extension/staff/PaperStaffModeExtension.java b/...-Paper/src/main/java/com/nookure/staff/paper/extension/staff/PaperStaffModeExtension.java
@@ -115,7 +115,7 @@ public void disableStaffMode() {
     long time = System.currentTimeMillis();
     player.disablePlayerPerks();
     restoreInventory();
-    if (config.get().staffMode.teleportToPreviousLocation()) restoreInventory();
+    if (config.get().staffMode.teleportToPreviousLocation()) restoreLocation();
     player.sendMiniMessage(messages.get().staffMode.toggledOff());
     writeStaffModeState(false);
 

diff --git a/...Paper/src/main/java/com/nookure/staff/paper/util/transoformer/PaperPlayerTransformer.java b/...Paper/src/main/java/com/nookure/staff/paper/util/transoformer/PaperPlayerTransformer.java
@@ -16,7 +16,9 @@
 import com.nookure.staff.paper.extension.FreezePlayerExtension;
 import com.nookure.staff.paper.factory.PaperPlayerWrapperFactory;
 import com.nookure.staff.paper.factory.StaffPaperPlayerWrapperFactory;
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
@@ -31,6 +33,7 @@ public final class PaperPlayerTransformer implements PlayerTransformer {
   private final ConfigurationContainer<BukkitMessages> messages;
   private final FreezeManager freezeManager;
   private final List<Class<? extends PlayerState>> states;
+  private JavaPlugin plugin;
 
   @Inject
   public PaperPlayerTransformer(
@@ -40,7 +43,8 @@ public PaperPlayerTransformer(
       @NotNull final Logger logger,
       @NotNull final ConfigurationContainer<BukkitMessages> messages,
       @NotNull final FreezeManager freezeManager,
-      @NotNull final List<Class<? extends PlayerState>> states
+      @NotNull final List<Class<? extends PlayerState>> states,
+      @NotNull final JavaPlugin plugin
   ) {
     this.playerWrapperManager = playerWrapperManager;
     this.paperPlayerWrapperFactory = paperPlayerWrapperFactory;
@@ -49,6 +53,7 @@ public PaperPlayerTransformer(
     this.logger = logger;
     this.messages = messages;
     this.states = states;
+    this.plugin = plugin;
   }
 
   @Override
@@ -58,16 +63,20 @@ public void player2Staff(@NotNull final UUID uuid) {
 
     if (player instanceof StaffPlayerWrapper) {
       logger.debug("Player %s is already a staff member.", player.getName());
+      return;
     }
 
     if (!(player instanceof PaperPlayerWrapper paperPlayerWrapper)) return;
 
     playerWrapperManager.removePlayerWrapper(paperPlayerWrapper.getPlayer());
-    final StaffPaperPlayerWrapper staffPlayerWrapper = staffPaperPlayerWrapperFactory
-        .create(paperPlayerWrapper.getPlayer(), states);
 
-    playerWrapperManager.addPlayerWrapper(staffPlayerWrapper.getPlayer(), staffPlayerWrapper);
-    staffPlayerWrapper.sendMiniMessage(messages.get().youAreNowAnStaffDuringPermissionInterceptor());
+    Bukkit.getScheduler().runTask(plugin, () -> {
+      final StaffPaperPlayerWrapper staffPlayerWrapper = staffPaperPlayerWrapperFactory
+          .create(paperPlayerWrapper.getPlayer(), states);
+
+      playerWrapperManager.addPlayerWrapper(staffPlayerWrapper.getPlayer(), staffPlayerWrapper);
+      staffPlayerWrapper.sendMiniMessage(messages.get().youAreNowAnStaffDuringPermissionInterceptor());
+    });
   }
 
   @Override

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -62,7 +62,7 @@ allprojects {
   repositories {
     mavenCentral()
     maven("https://jitpack.io")
-    maven("https://papermc.io/repo/repository/maven-public/")
+    maven("https://repo.papermc.io/repository/maven-public/")
     maven("https://maven.nookure.com")
     maven("https://mvn.exceptionflug.de/repository/exceptionflug-public/")
     maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum