aboutsummaryrefslogtreecommitdiffstats
path: root/bukkit/src/main/java/com/leonardobishop
diff options
context:
space:
mode:
authorKrakenied <Krakenied1@gmail.com>2022-12-09 17:45:00 +0100
committerKrakenied <Krakenied1@gmail.com>2022-12-17 18:01:30 +0100
commita2c013d6b181c5ff1ce9398ae1f301b85c2893f3 (patch)
tree47c101caef5a1591cc502283651181faa9025e59 /bukkit/src/main/java/com/leonardobishop
parenteb5d68c1ba7e11591c0f0f671f7c145e7aa74908 (diff)
Optimize walking mode validation
Lowercasing the mode is not needed because of a config validator
Diffstat (limited to 'bukkit/src/main/java/com/leonardobishop')
-rw-r--r--bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/WalkingTaskType.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/WalkingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/WalkingTaskType.java
index ab435d00..f7bf0e42 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/WalkingTaskType.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/WalkingTaskType.java
@@ -41,14 +41,14 @@ public final class WalkingTaskType extends BukkitTaskType {
}
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
- public void onMove(PlayerMoveEvent event) {
+ public void onPlayerMove(PlayerMoveEvent event) {
if (event.getFrom().getBlockX() == event.getTo().getBlockX() && event.getFrom().getBlockZ() == event.getTo().getBlockZ()) {
return;
}
- Player player = event.getPlayer();
+ if (event.getPlayer().hasMetadata("NPC")) return;
- if (player.hasMetadata("NPC")) return;
+ Player player = event.getPlayer();
QPlayer qPlayer = plugin.getPlayerManager().getPlayer(player.getUniqueId());
if (qPlayer == null) {
@@ -62,8 +62,8 @@ public final class WalkingTaskType extends BukkitTaskType {
super.debug("Player moved", quest.getId(), task.getId(), player.getUniqueId());
- if (task.getConfigValue("mode") != null
- && !validateTransportMethod(player, task.getConfigValue("mode").toString())) {
+ final String mode = (String) task.getConfigValue("mode");
+ if (mode != null && !validateMode(player, mode)) {
super.debug("Player's mode does not match required mode, continuing...", quest.getId(), task.getId(), player.getUniqueId());
continue;
}
@@ -80,8 +80,8 @@ public final class WalkingTaskType extends BukkitTaskType {
}
}
- private boolean validateTransportMethod(Player player, String mode) {
- return switch (mode.toLowerCase()) {
+ private boolean validateMode(Player player, String mode) {
+ return switch (mode) {
case "boat" -> player.getVehicle() != null && player.getVehicle().getType() == EntityType.BOAT;
case "horse" -> player.getVehicle() != null && player.getVehicle().getType() == EntityType.HORSE;
case "pig" -> player.getVehicle() != null && player.getVehicle().getType() == EntityType.PIG;