From abcece373fc03ef79040b3e5cdb1f6f514b1338a Mon Sep 17 00:00:00 2001 From: XiaoMoMi <972454774@qq.com> Date: Wed, 13 Mar 2024 19:19:18 +0800 Subject: [PATCH] 2.3.3.6 --- build.gradle.kts | 2 +- paper/build.gradle.kts | 2 +- .../paper/CustomNameplatesPluginImpl.java | 3 ++- .../mechanic/nameplate/NameplateManagerImpl.java | 2 +- .../tag/listener/MagicCosmeticsListener.java | 13 +++++++++---- .../requirement/RequirementManagerImpl.java | 1 + 6 files changed, 15 insertions(+), 8 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index e92c830..474c23a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ plugins { allprojects { - version = "2.3.3.4" + version = "2.3.3.6" apply() apply(plugin = "java") diff --git a/paper/build.gradle.kts b/paper/build.gradle.kts index 28d4f51..0158b02 100644 --- a/paper/build.gradle.kts +++ b/paper/build.gradle.kts @@ -38,7 +38,7 @@ dependencies { compileOnly("commons-io:commons-io:2.15.1") compileOnly("org.geysermc.geyser:api:2.2.0-SNAPSHOT") compileOnly("LibsDisguises:LibsDisguises:10.0.42") - compileOnly("com.github.Xiao-MoMi:BiomeAPI:0.2") + compileOnly("com.github.Xiao-MoMi:BiomeAPI:0.3") // chat channels compileOnly(files("libs/VentureChat-3.7.1.jar")) diff --git a/paper/src/main/java/net/momirealms/customnameplates/paper/CustomNameplatesPluginImpl.java b/paper/src/main/java/net/momirealms/customnameplates/paper/CustomNameplatesPluginImpl.java index 564dacb..8e92ccd 100644 --- a/paper/src/main/java/net/momirealms/customnameplates/paper/CustomNameplatesPluginImpl.java +++ b/paper/src/main/java/net/momirealms/customnameplates/paper/CustomNameplatesPluginImpl.java @@ -85,7 +85,8 @@ public class CustomNameplatesPluginImpl extends CustomNameplatesPlugin implement Dependency.SQLITE_DRIVER, Dependency.BSTATS_BASE, Dependency.HIKARI, - Dependency.BSTATS_BUKKIT + Dependency.BSTATS_BUKKIT, + Dependency.BIOME_API ) )); ReflectionUtils.load(); diff --git a/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/nameplate/NameplateManagerImpl.java b/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/nameplate/NameplateManagerImpl.java index ad44906..54ff1eb 100644 --- a/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/nameplate/NameplateManagerImpl.java +++ b/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/nameplate/NameplateManagerImpl.java @@ -312,7 +312,7 @@ public class NameplateManagerImpl implements NameplateManager, Listener { plugin.getScheduler().runTaskAsyncLater(() -> { if (player.isOnline()) this.createNameTag(player); - }, 100, TimeUnit.MILLISECONDS); + }, 50, TimeUnit.MILLISECONDS); } } diff --git a/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/nameplate/tag/listener/MagicCosmeticsListener.java b/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/nameplate/tag/listener/MagicCosmeticsListener.java index c7ba783..557eae5 100644 --- a/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/nameplate/tag/listener/MagicCosmeticsListener.java +++ b/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/nameplate/tag/listener/MagicCosmeticsListener.java @@ -22,12 +22,15 @@ import com.francobm.magicosmetics.api.CosmeticType; import com.francobm.magicosmetics.cache.PlayerData; import com.francobm.magicosmetics.cache.cosmetics.Hat; import com.francobm.magicosmetics.events.*; +import net.momirealms.customnameplates.api.CustomNameplatesPlugin; import net.momirealms.customnameplates.paper.mechanic.nameplate.tag.unlimited.UnlimitedPlayer; import net.momirealms.customnameplates.paper.mechanic.nameplate.tag.unlimited.UnlimitedTagManagerImpl; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; +import java.util.concurrent.TimeUnit; + public class MagicCosmeticsListener implements Listener { private final UnlimitedTagManagerImpl unlimitedTagManager; @@ -94,10 +97,12 @@ public class MagicCosmeticsListener implements Listener { public void onDataLoaded(PlayerDataLoadEvent event) { for (Cosmetic cosmetic : event.getEquippedCosmetics()) { if (cosmetic instanceof Hat hat) { - if (unlimitedTagManager.getUnlimitedObject(event.getPlayerData().getUniqueId()) instanceof UnlimitedPlayer unlimitedPlayer) { - unlimitedPlayer.setHatOffset(hat.isHideCosmetic() ? 0 : hat.getOffSetY()); - unlimitedPlayer.teleport(); - } + CustomNameplatesPlugin.get().getScheduler().runTaskAsyncLater(() -> { + if (unlimitedTagManager.getUnlimitedObject(event.getPlayerData().getUniqueId()) instanceof UnlimitedPlayer unlimitedPlayer) { + unlimitedPlayer.setHatOffset(hat.isHideCosmetic() ? 0 : hat.getOffSetY()); + unlimitedPlayer.teleport(); + } + }, 100, TimeUnit.MILLISECONDS); } } } diff --git a/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/requirement/RequirementManagerImpl.java b/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/requirement/RequirementManagerImpl.java index a9c958f..406c883 100644 --- a/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/requirement/RequirementManagerImpl.java +++ b/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/requirement/RequirementManagerImpl.java @@ -32,6 +32,7 @@ import net.momirealms.customnameplates.paper.util.ClassUtils; import net.momirealms.customnameplates.paper.util.ConfigUtils; import net.momirealms.customnameplates.paper.util.DisguiseUtils; import net.momirealms.customnameplates.paper.util.GeyserUtils; +import org.bson.types.Binary; import org.bukkit.World; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.Player;