diff --git a/.gradle/8.12/executionHistory/executionHistory.bin b/.gradle/8.12/executionHistory/executionHistory.bin index 99f5f78..c32653d 100644 Binary files a/.gradle/8.12/executionHistory/executionHistory.bin and b/.gradle/8.12/executionHistory/executionHistory.bin differ diff --git a/.gradle/8.12/executionHistory/executionHistory.lock b/.gradle/8.12/executionHistory/executionHistory.lock index 53329c3..1fe4ec2 100644 Binary files a/.gradle/8.12/executionHistory/executionHistory.lock and b/.gradle/8.12/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.12/fileHashes/fileHashes.bin b/.gradle/8.12/fileHashes/fileHashes.bin index 778a2b8..5509fa1 100644 Binary files a/.gradle/8.12/fileHashes/fileHashes.bin and b/.gradle/8.12/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.12/fileHashes/fileHashes.lock b/.gradle/8.12/fileHashes/fileHashes.lock index 412e73b..204f949 100644 Binary files a/.gradle/8.12/fileHashes/fileHashes.lock and b/.gradle/8.12/fileHashes/fileHashes.lock differ diff --git a/.gradle/8.12/fileHashes/resourceHashesCache.bin b/.gradle/8.12/fileHashes/resourceHashesCache.bin index b81d9d2..d827b3d 100644 Binary files a/.gradle/8.12/fileHashes/resourceHashesCache.bin and b/.gradle/8.12/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index bbb29a6..55d2a70 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/build/classes/java/main/re/imc/geysermodelengine/listener/ModelListener.class b/build/classes/java/main/re/imc/geysermodelengine/listener/ModelListener.class index ba7cc7d..d2b7e2b 100644 Binary files a/build/classes/java/main/re/imc/geysermodelengine/listener/ModelListener.class and b/build/classes/java/main/re/imc/geysermodelengine/listener/ModelListener.class differ diff --git a/build/classes/java/main/re/imc/geysermodelengine/managers/model/EntityTaskManager.class b/build/classes/java/main/re/imc/geysermodelengine/managers/model/EntityTaskManager.class index 2a5e04c..7c8dc6e 100644 Binary files a/build/classes/java/main/re/imc/geysermodelengine/managers/model/EntityTaskManager.class and b/build/classes/java/main/re/imc/geysermodelengine/managers/model/EntityTaskManager.class differ diff --git a/build/classes/java/main/re/imc/geysermodelengine/managers/player/PlayerManager.class b/build/classes/java/main/re/imc/geysermodelengine/managers/player/PlayerManager.class index d9fc723..3c94888 100644 Binary files a/build/classes/java/main/re/imc/geysermodelengine/managers/player/PlayerManager.class and b/build/classes/java/main/re/imc/geysermodelengine/managers/player/PlayerManager.class differ diff --git a/build/libs/GeyserModelEngine-1.0.0-all.jar b/build/libs/GeyserModelEngine-1.0.0-all.jar index efcf1e5..d0eac6b 100644 Binary files a/build/libs/GeyserModelEngine-1.0.0-all.jar and b/build/libs/GeyserModelEngine-1.0.0-all.jar differ diff --git a/build/libs/GeyserModelEngine-1.0.0.jar b/build/libs/GeyserModelEngine-1.0.0.jar index b97d201..1c63129 100644 Binary files a/build/libs/GeyserModelEngine-1.0.0.jar and b/build/libs/GeyserModelEngine-1.0.0.jar differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/BedrockMountControlManager.class.uniqueId4 b/build/tmp/compileJava/compileTransaction/stash-dir/BedrockMountControlManager.class.uniqueId4 deleted file mode 100644 index 74586e4..0000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/BedrockMountControlManager.class.uniqueId4 and /dev/null differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/BedrockMountControlRunnable.class.uniqueId13 b/build/tmp/compileJava/compileTransaction/stash-dir/BedrockMountControlRunnable.class.uniqueId13 index b3ca4c0..857e668 100644 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/BedrockMountControlRunnable.class.uniqueId13 and b/build/tmp/compileJava/compileTransaction/stash-dir/BedrockMountControlRunnable.class.uniqueId13 differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/EntityTaskManager.class.uniqueId6 b/build/tmp/compileJava/compileTransaction/stash-dir/EntityTaskManager.class.uniqueId5 similarity index 100% rename from build/tmp/compileJava/compileTransaction/stash-dir/EntityTaskManager.class.uniqueId6 rename to build/tmp/compileJava/compileTransaction/stash-dir/EntityTaskManager.class.uniqueId5 diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/GeyserModelEngine.class.uniqueId0 b/build/tmp/compileJava/compileTransaction/stash-dir/GeyserModelEngine.class.uniqueId0 index 8666af3..5c19ad4 100644 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/GeyserModelEngine.class.uniqueId0 and b/build/tmp/compileJava/compileTransaction/stash-dir/GeyserModelEngine.class.uniqueId0 differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/ModelListener.class.uniqueId2 b/build/tmp/compileJava/compileTransaction/stash-dir/ModelListener.class.uniqueId2 index ae16c8f..ba7cc7d 100644 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/ModelListener.class.uniqueId2 and b/build/tmp/compileJava/compileTransaction/stash-dir/ModelListener.class.uniqueId2 differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/ModelManager.class.uniqueId9 b/build/tmp/compileJava/compileTransaction/stash-dir/ModelManager.class.uniqueId9 index 719ea12..c744140 100644 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/ModelManager.class.uniqueId9 and b/build/tmp/compileJava/compileTransaction/stash-dir/ModelManager.class.uniqueId9 differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/MountPacketListener.class.uniqueId7 b/build/tmp/compileJava/compileTransaction/stash-dir/MountPacketListener.class.uniqueId7 index 779c016..76c9a4f 100644 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/MountPacketListener.class.uniqueId7 and b/build/tmp/compileJava/compileTransaction/stash-dir/MountPacketListener.class.uniqueId7 differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/PlayerManager.class.uniqueId6 b/build/tmp/compileJava/compileTransaction/stash-dir/PlayerManager.class.uniqueId6 new file mode 100644 index 0000000..d9fc723 Binary files /dev/null and b/build/tmp/compileJava/compileTransaction/stash-dir/PlayerManager.class.uniqueId6 differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/UpdateTaskRunnable.class.uniqueId5 b/build/tmp/compileJava/compileTransaction/stash-dir/UpdateTaskRunnable.class.uniqueId4 similarity index 100% rename from build/tmp/compileJava/compileTransaction/stash-dir/UpdateTaskRunnable.class.uniqueId5 rename to build/tmp/compileJava/compileTransaction/stash-dir/UpdateTaskRunnable.class.uniqueId4 diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin index b2994fb..654222e 100644 Binary files a/build/tmp/compileJava/previous-compilation-data.bin and b/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/src/main/java/re/imc/geysermodelengine/listener/ModelListener.java b/src/main/java/re/imc/geysermodelengine/listener/ModelListener.java index 022dc70..7fae312 100644 --- a/src/main/java/re/imc/geysermodelengine/listener/ModelListener.java +++ b/src/main/java/re/imc/geysermodelengine/listener/ModelListener.java @@ -63,11 +63,13 @@ public class ModelListener implements Listener { //TODO Find out why we need this bc uh what? @EventHandler public void onPlayerLogin(PlayerJoinEvent event) { - Bukkit.getGlobalRegionScheduler().runDelayed(plugin, scheduledTask -> plugin.getPlayerManager().getPlayerJoinedCache().add(event.getPlayer()), 10); + Player player = event.getPlayer(); + Bukkit.getGlobalRegionScheduler().runDelayed(plugin, scheduledTask -> plugin.getPlayerManager().getPlayerJoinedCache().add(player.getUniqueId()), 10); } @EventHandler public void onPlayerQuit(PlayerQuitEvent event) { - Bukkit.getGlobalRegionScheduler().runDelayed(plugin, scheduledTask -> plugin.getPlayerManager().getPlayerJoinedCache().remove(event.getPlayer()), 10); + Player player = event.getPlayer(); + Bukkit.getGlobalRegionScheduler().runDelayed(plugin, scheduledTask -> plugin.getPlayerManager().getPlayerJoinedCache().remove(player.getUniqueId()), 10); } } diff --git a/src/main/java/re/imc/geysermodelengine/managers/model/EntityTaskManager.java b/src/main/java/re/imc/geysermodelengine/managers/model/EntityTaskManager.java index 0826b3d..34c83f3 100644 --- a/src/main/java/re/imc/geysermodelengine/managers/model/EntityTaskManager.java +++ b/src/main/java/re/imc/geysermodelengine/managers/model/EntityTaskManager.java @@ -102,7 +102,7 @@ public class EntityTaskManager { private void sendSpawnPacket(ModelEntityData model, Player onlinePlayer) { EntityTaskRunnable task = model.getEntityTask(); - boolean firstJoined = !plugin.getPlayerManager().getPlayerJoinedCache().contains(onlinePlayer); + boolean firstJoined = !plugin.getPlayerManager().getPlayerJoinedCache().contains(onlinePlayer.getUniqueId()); if (firstJoined) { task.sendEntityData(model, onlinePlayer, plugin.getConfigManager().getConfig().getInt("join-send-delay") / 50); @@ -113,7 +113,7 @@ public class EntityTaskManager { public boolean canSee(Player player, PacketEntity entity) { if (!player.isOnline()) return false; - if (!plugin.getPlayerManager().getPlayerJoinedCache().contains(player)) return false; + if (!plugin.getPlayerManager().getPlayerJoinedCache().contains(player.getUniqueId())) return false; Location playerLocation = player.getLocation().clone(); Location entityLocation = entity.getLocation().clone(); diff --git a/src/main/java/re/imc/geysermodelengine/managers/player/PlayerManager.java b/src/main/java/re/imc/geysermodelengine/managers/player/PlayerManager.java index c7a4d7a..978cfe7 100644 --- a/src/main/java/re/imc/geysermodelengine/managers/player/PlayerManager.java +++ b/src/main/java/re/imc/geysermodelengine/managers/player/PlayerManager.java @@ -1,14 +1,13 @@ package re.imc.geysermodelengine.managers.player; -import org.bukkit.entity.Player; - import java.util.HashSet; +import java.util.UUID; public class PlayerManager { - private final HashSet playerJoinedCache = new HashSet<>(); + private final HashSet playerJoinedCache = new HashSet<>(); - public HashSet getPlayerJoinedCache() { + public HashSet getPlayerJoinedCache() { return playerJoinedCache; } }