From 04ac4f4a12708de5c0aa0ce191f12b3d3150de47 Mon Sep 17 00:00:00 2001 From: Ka0rX Date: Wed, 4 Jan 2023 12:46:03 +0100 Subject: [PATCH 1/5] Debug move{type=WALK} --- .../mmocore/experience/source/MoveExperienceSource.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/experience/source/MoveExperienceSource.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/experience/source/MoveExperienceSource.java index 0ce3b5af..cb045022 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/experience/source/MoveExperienceSource.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/experience/source/MoveExperienceSource.java @@ -6,6 +6,7 @@ import net.Indyuce.mmocore.experience.dispenser.ExperienceDispenser; import net.Indyuce.mmocore.experience.source.type.SpecificExperienceSource; import net.Indyuce.mmocore.manager.profession.ExperienceSourceManager; import org.apache.commons.lang.Validate; +import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.player.PlayerMoveEvent; @@ -68,7 +69,7 @@ public class MoveExperienceSource extends SpecificExperienceSource { FLY((p) -> p.isFlying() || p.isGliding()), SWIM((p) -> p.getLocation().getBlock().isLiquid()), SPRINT(Player::isSprinting), - WALK((p) -> !p.isSneaking() && !p.isSprinting() && !p.isFlying() && !p.getLocation().getBlock().isLiquid()); + WALK((p) -> !p.isSneaking() && !p.isSprinting() &&((Entity)p).isOnGround()&& !p.isFlying() && !p.getLocation().getBlock().isLiquid()); private final Function matching; From 3a3812480f3e84c9feeecf548a19cbcf151a1c75 Mon Sep 17 00:00:00 2001 From: Ka0rX Date: Wed, 4 Jan 2023 12:53:58 +0100 Subject: [PATCH 2/5] Debug Skill Binding Issue. --- .../java/net/Indyuce/mmocore/api/player/PlayerData.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java index 31a8fc3a..a9d3649a 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java @@ -1115,8 +1115,8 @@ public class PlayerData extends OfflinePlayerData implements Closable, Experienc */ public void bindPassiveSkill(int slot, @NotNull PassiveSkill skill) { Validate.notNull(skill, "Skill cannot be null"); - final int maxBound = getProfess().getMaxBoundActiveSkills(); - if (slot > 0 && boundPassiveSkills.size() >= maxBound) { + final int maxBound = getProfess().getMaxBoundPassiveSkills(); + if (slot >= 0 && boundPassiveSkills.size() >= maxBound) { final @NotNull PassiveSkill current = boundPassiveSkills.set(slot, skill); if (current != null) current.unregister(mmoData); @@ -1151,7 +1151,7 @@ public class PlayerData extends OfflinePlayerData implements Closable, Experienc */ public void bindActiveSkill(int slot, ClassSkill skill) { Validate.notNull(skill, "Skill cannot be null"); - if (slot > 0 && boundSkills.size() >= getProfess().getMaxBoundActiveSkills()) + if (slot >= 0 && boundSkills.size() >= getProfess().getMaxBoundActiveSkills()) boundSkills.set(slot, skill); else boundSkills.add(skill); From e7815b09f2b587452fd8db938680f9816fadb4d8 Mon Sep 17 00:00:00 2001 From: Ka0rX Date: Wed, 4 Jan 2023 13:01:38 +0100 Subject: [PATCH 3/5] Debug /mmocore admin exp take --- .../java/net/Indyuce/mmocore/experience/PlayerProfessions.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/experience/PlayerProfessions.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/experience/PlayerProfessions.java index 9ad28f5c..963910d8 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/experience/PlayerProfessions.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/experience/PlayerProfessions.java @@ -171,7 +171,7 @@ public class PlayerProfessions { public void giveExperience(Profession profession, double value, EXPSource source, @Nullable Location hologramLocation, boolean splitExp) { Validate.isTrue(playerData.isOnline(), "Cannot give experience to offline player"); if (value <= 0) { - exp.put(profession.getId(), Math.max(0, exp.get(profession.getId() + value))); + exp.put(profession.getId(), Math.max(0, exp.get(profession.getId()) + value)); return; } From f3152c776e31481ea01a6fcff941ed42c9dd8fd2 Mon Sep 17 00:00:00 2001 From: Ka0rX Date: Wed, 4 Jan 2023 13:22:56 +0100 Subject: [PATCH 4/5] Debug /guild accept or deny command. --- .../src/main/java/net/Indyuce/mmocore/command/GuildCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/command/GuildCommand.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/command/GuildCommand.java index f8e39ee2..b8b708d7 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/command/GuildCommand.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/command/GuildCommand.java @@ -39,7 +39,7 @@ public class GuildCommand extends BukkitCommand { Bukkit.getServer().getPluginManager().callEvent(event); if (event.isCancelled()) return true; - if (args.length > 1) { + if (args.length >= 1) { final @Nullable GuildInvite invite; if (args.length > 1) From 1223592b89caf1243393f26e528edbeced82b842 Mon Sep 17 00:00:00 2001 From: Ka0rX Date: Wed, 4 Jan 2023 14:52:18 +0100 Subject: [PATCH 5/5] Debug Quests Progress stopping when reloading. --- .../main/java/net/Indyuce/mmocore/api/quest/PlayerQuests.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/quest/PlayerQuests.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/quest/PlayerQuests.java index 6acbd3b4..bf0710bb 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/quest/PlayerQuests.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/quest/PlayerQuests.java @@ -173,9 +173,6 @@ public class PlayerQuests implements Closable { bossbar.removeAll(); Bukkit.removeBossBar(bossbarNamespacedKey); } - - // Close current objective progress - closeCurrentQuest(); } public boolean checkCooldownAvailability(Quest quest) {