diff --git a/.gradle/8.12/executionHistory/executionHistory.bin b/.gradle/8.12/executionHistory/executionHistory.bin index 52de678..351a349 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 449f3c6..54928b9 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 44b94fe..d89eca3 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 8e2e9a3..c0ccd7a 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 16edbb8..63d18f2 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 60d7653..f79cede 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 3ff07bc..40c530c 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/listener/MountPacketListener.class b/build/classes/java/main/re/imc/geysermodelengine/listener/MountPacketListener.class index 37866e4..af8e139 100644 Binary files a/build/classes/java/main/re/imc/geysermodelengine/listener/MountPacketListener.class and b/build/classes/java/main/re/imc/geysermodelengine/listener/MountPacketListener.class differ diff --git a/build/classes/java/main/re/imc/geysermodelengine/managers/model/ModelManager.class b/build/classes/java/main/re/imc/geysermodelengine/managers/model/ModelManager.class index 73cb8c9..cd920e4 100644 Binary files a/build/classes/java/main/re/imc/geysermodelengine/managers/model/ModelManager.class and b/build/classes/java/main/re/imc/geysermodelengine/managers/model/ModelManager.class differ diff --git a/build/classes/java/main/re/imc/geysermodelengine/runnables/BedrockMountControlRunnable.class b/build/classes/java/main/re/imc/geysermodelengine/runnables/BedrockMountControlRunnable.class index 857e668..0d8f7fa 100644 Binary files a/build/classes/java/main/re/imc/geysermodelengine/runnables/BedrockMountControlRunnable.class and b/build/classes/java/main/re/imc/geysermodelengine/runnables/BedrockMountControlRunnable.class differ diff --git a/build/libs/GeyserModelEngine-1.0.0-all.jar b/build/libs/GeyserModelEngine-1.0.0-all.jar index bd37739..b330f03 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 ac1f0e4..34c4f74 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/reports/problems/problems-report.html b/build/reports/problems/problems-report.html index b0aef5c..19dac89 100644 --- a/build/reports/problems/problems-report.html +++ b/build/reports/problems/problems-report.html @@ -650,7 +650,7 @@ code + .copy-button { diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/BedrockMountControlRunnable.class.uniqueId15 b/build/tmp/compileJava/compileTransaction/stash-dir/BedrockMountControlRunnable.class.uniqueId12 similarity index 100% rename from build/tmp/compileJava/compileTransaction/stash-dir/BedrockMountControlRunnable.class.uniqueId15 rename to build/tmp/compileJava/compileTransaction/stash-dir/BedrockMountControlRunnable.class.uniqueId12 diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/CommandManager.class.uniqueId14 b/build/tmp/compileJava/compileTransaction/stash-dir/CommandManager.class.uniqueId11 similarity index 100% rename from build/tmp/compileJava/compileTransaction/stash-dir/CommandManager.class.uniqueId14 rename to build/tmp/compileJava/compileTransaction/stash-dir/CommandManager.class.uniqueId11 diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/CommandManagers.class.uniqueId11 b/build/tmp/compileJava/compileTransaction/stash-dir/CommandManagers.class.uniqueId11 deleted file mode 100644 index 2d0cc12..0000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/CommandManagers.class.uniqueId11 and /dev/null differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/ConfigManager.class.uniqueId12 b/build/tmp/compileJava/compileTransaction/stash-dir/ConfigManager.class.uniqueId9 similarity index 100% rename from build/tmp/compileJava/compileTransaction/stash-dir/ConfigManager.class.uniqueId12 rename to build/tmp/compileJava/compileTransaction/stash-dir/ConfigManager.class.uniqueId9 diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/EntityTaskManager.class.uniqueId7 b/build/tmp/compileJava/compileTransaction/stash-dir/EntityTaskManager.class.uniqueId5 similarity index 100% rename from build/tmp/compileJava/compileTransaction/stash-dir/EntityTaskManager.class.uniqueId7 rename to build/tmp/compileJava/compileTransaction/stash-dir/EntityTaskManager.class.uniqueId5 diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/EntityTaskRunnable.class.uniqueId13 b/build/tmp/compileJava/compileTransaction/stash-dir/EntityTaskRunnable.class.uniqueId10 similarity index 100% rename from build/tmp/compileJava/compileTransaction/stash-dir/EntityTaskRunnable.class.uniqueId13 rename to build/tmp/compileJava/compileTransaction/stash-dir/EntityTaskRunnable.class.uniqueId10 diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/GeyserModelEngineCommandManager.class.uniqueId5 b/build/tmp/compileJava/compileTransaction/stash-dir/GeyserModelEngineCommandManager.class.uniqueId3 similarity index 100% rename from build/tmp/compileJava/compileTransaction/stash-dir/GeyserModelEngineCommandManager.class.uniqueId5 rename to build/tmp/compileJava/compileTransaction/stash-dir/GeyserModelEngineCommandManager.class.uniqueId3 diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/ModelEntityData.class.uniqueId9 b/build/tmp/compileJava/compileTransaction/stash-dir/ModelEntityData.class.uniqueId7 similarity index 100% rename from build/tmp/compileJava/compileTransaction/stash-dir/ModelEntityData.class.uniqueId9 rename to build/tmp/compileJava/compileTransaction/stash-dir/ModelEntityData.class.uniqueId7 diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/ModelListener.class.uniqueId3 b/build/tmp/compileJava/compileTransaction/stash-dir/ModelListener.class.uniqueId2 similarity index 100% rename from build/tmp/compileJava/compileTransaction/stash-dir/ModelListener.class.uniqueId3 rename to build/tmp/compileJava/compileTransaction/stash-dir/ModelListener.class.uniqueId2 diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/ModelManager.class.uniqueId10 b/build/tmp/compileJava/compileTransaction/stash-dir/ModelManager.class.uniqueId8 similarity index 100% rename from build/tmp/compileJava/compileTransaction/stash-dir/ModelManager.class.uniqueId10 rename to build/tmp/compileJava/compileTransaction/stash-dir/ModelManager.class.uniqueId8 diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/MountPacketListener.class.uniqueId8 b/build/tmp/compileJava/compileTransaction/stash-dir/MountPacketListener.class.uniqueId6 similarity index 100% rename from build/tmp/compileJava/compileTransaction/stash-dir/MountPacketListener.class.uniqueId8 rename to build/tmp/compileJava/compileTransaction/stash-dir/MountPacketListener.class.uniqueId6 diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/PacketEntity.class.uniqueId2 b/build/tmp/compileJava/compileTransaction/stash-dir/PacketEntity.class.uniqueId2 deleted file mode 100644 index ca5d881..0000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/PacketEntity.class.uniqueId2 and /dev/null differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/SubCommands.class.uniqueId4 b/build/tmp/compileJava/compileTransaction/stash-dir/SubCommands.class.uniqueId4 deleted file mode 100644 index 01cd174..0000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/SubCommands.class.uniqueId4 and /dev/null differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/UpdateTaskRunnable.class.uniqueId6 b/build/tmp/compileJava/compileTransaction/stash-dir/UpdateTaskRunnable.class.uniqueId4 similarity index 100% rename from build/tmp/compileJava/compileTransaction/stash-dir/UpdateTaskRunnable.class.uniqueId6 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 a2f0e43..b2ead81 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 370912c..5e12539 100644 --- a/src/main/java/re/imc/geysermodelengine/listener/ModelListener.java +++ b/src/main/java/re/imc/geysermodelengine/listener/ModelListener.java @@ -43,14 +43,14 @@ public class ModelListener implements Listener { ModelEntityData model = map.get(event.getVehicle()); if (model != null && event.getPassenger() instanceof Player player) { - plugin.getModelManager().getDriversCache().put(player, Pair.of(event.getVehicle(), event.getSeat())); + plugin.getModelManager().getDriversCache().put(player.getUniqueId(), Pair.of(event.getVehicle(), event.getSeat())); } } @EventHandler(priority = EventPriority.MONITOR) public void onModelDismount(ModelDismountEvent event) { if (event.getPassenger() instanceof Player player) { - plugin.getModelManager().getDriversCache().remove(player); + plugin.getModelManager().getDriversCache().remove(player.getUniqueId()); } } diff --git a/src/main/java/re/imc/geysermodelengine/listener/MountPacketListener.java b/src/main/java/re/imc/geysermodelengine/listener/MountPacketListener.java index a8ab5d7..cb8ab83 100644 --- a/src/main/java/re/imc/geysermodelengine/listener/MountPacketListener.java +++ b/src/main/java/re/imc/geysermodelengine/listener/MountPacketListener.java @@ -28,7 +28,7 @@ public class MountPacketListener implements PacketListener { Player player = event.getPlayer(); WrapperPlayClientEntityAction action = new WrapperPlayClientEntityAction(event); - Pair seat = plugin.getModelManager().getDriversCache().get(player); + Pair seat = plugin.getModelManager().getDriversCache().get(player.getUniqueId()); if (seat == null) return; if (action.getAction() != WrapperPlayClientEntityAction.Action.START_SNEAKING) return; diff --git a/src/main/java/re/imc/geysermodelengine/managers/model/ModelManager.java b/src/main/java/re/imc/geysermodelengine/managers/model/ModelManager.java index 6789bd6..1107304 100644 --- a/src/main/java/re/imc/geysermodelengine/managers/model/ModelManager.java +++ b/src/main/java/re/imc/geysermodelengine/managers/model/ModelManager.java @@ -22,7 +22,7 @@ public class ModelManager { private final ConcurrentHashMap> entitiesCache = new ConcurrentHashMap<>(); private final ConcurrentHashMap modelEntitiesCache = new ConcurrentHashMap<>(); - private final ConcurrentHashMap> driversCache = new ConcurrentHashMap<>(); + private final ConcurrentHashMap> driversCache = new ConcurrentHashMap<>(); public ModelManager(GeyserModelEngine plugin) { this.plugin = plugin; @@ -65,7 +65,7 @@ public class ModelManager { return modelEntitiesCache; } - public ConcurrentHashMap> getDriversCache() { + public ConcurrentHashMap> getDriversCache() { return driversCache; } } diff --git a/src/main/java/re/imc/geysermodelengine/runnables/BedrockMountControlRunnable.java b/src/main/java/re/imc/geysermodelengine/runnables/BedrockMountControlRunnable.java index 403d18d..7693197 100644 --- a/src/main/java/re/imc/geysermodelengine/runnables/BedrockMountControlRunnable.java +++ b/src/main/java/re/imc/geysermodelengine/runnables/BedrockMountControlRunnable.java @@ -28,7 +28,7 @@ public class BedrockMountControlRunnable implements Consumer { if (!FloodgateApi.getInstance().isFloodgatePlayer(player.getUniqueId())) continue; float pitch = player.getLocation().getPitch(); - Pair seat = plugin.getModelManager().getDriversCache().get(player); + Pair seat = plugin.getModelManager().getDriversCache().get(player.getUniqueId()); if (seat == null) continue;