From 553a44cd07b7ec85fce1bffb75baec5ef88a1175 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sat, 28 Oct 2023 10:24:41 -0700 Subject: [PATCH] Debug to view advancements --- pom.xml | 2 +- .../java/world/bentobox/boxed/AdvancementsManager.java | 8 ++++++++ .../bentobox/boxed/listeners/AdvancementListener.java | 5 +++++ .../world/bentobox/boxed/listeners/NewAreaListener.java | 2 +- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index df67da1..f5d2d38 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ 2.0.9 - 1.20.1-R0.1-SNAPSHOT + 1.20.2-R0.1-SNAPSHOT 1.24.0 ${build.version}-SNAPSHOT diff --git a/src/main/java/world/bentobox/boxed/AdvancementsManager.java b/src/main/java/world/bentobox/boxed/AdvancementsManager.java index d8adc0f..c81ec78 100644 --- a/src/main/java/world/bentobox/boxed/AdvancementsManager.java +++ b/src/main/java/world/bentobox/boxed/AdvancementsManager.java @@ -16,6 +16,7 @@ import org.bukkit.entity.Player; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; +import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.events.island.IslandEvent; import world.bentobox.bentobox.database.Database; import world.bentobox.bentobox.database.objects.Island; @@ -183,10 +184,12 @@ public class AdvancementsManager { */ public int addAdvancement(Player p, Advancement advancement) { if (!addon.inWorld(p.getWorld())) { + BentoBox.getInstance().logDebug("Wrong world"); // Wrong world return 0; } int score = getScore(advancement); + BentoBox.getInstance().logDebug("score is " + score); if (score == 0) { return 0; } @@ -197,9 +200,11 @@ public class AdvancementsManager { && addAdvancement(island, advancement.getKey().toString())) { int oldSize = island.getProtectionRange(); int newSize = Math.max(1, oldSize + score); + BentoBox.getInstance().logDebug("Changing size old = " + oldSize + " new = " + newSize); setProtectionSize(island, newSize, p.getUniqueId()); return score; } + BentoBox.getInstance().logDebug("No island"); return 0; } @@ -240,6 +245,7 @@ public class AdvancementsManager { * @return score of advancement, or 0 if it cannot be worked out */ public int getScore(Advancement a) { + BentoBox.getInstance().logDebug("get score"); String adv = "advancements." + a.getKey().getKey(); // Unknowns if (adv.endsWith("/root")) { @@ -257,7 +263,9 @@ public class AdvancementsManager { return 0; } } else { + BentoBox.getInstance().logDebug("Checking yaml for " + adv); if (advConfig.contains(adv)) { + BentoBox.getInstance().logDebug("It's there"); return advConfig.getInt(adv, this.unknownAdvChange); } diff --git a/src/main/java/world/bentobox/boxed/listeners/AdvancementListener.java b/src/main/java/world/bentobox/boxed/listeners/AdvancementListener.java index f79a802..6d293e7 100644 --- a/src/main/java/world/bentobox/boxed/listeners/AdvancementListener.java +++ b/src/main/java/world/bentobox/boxed/listeners/AdvancementListener.java @@ -30,6 +30,7 @@ import org.bukkit.event.player.PlayerMoveEvent; import org.bukkit.event.player.PlayerPortalEvent; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; +import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.events.island.IslandNewIslandEvent; import world.bentobox.bentobox.api.events.team.TeamJoinedEvent; import world.bentobox.bentobox.api.events.team.TeamLeaveEvent; @@ -84,14 +85,17 @@ public class AdvancementListener implements Listener { */ @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) public void onAdvancement(PlayerAdvancementDoneEvent e) { + BentoBox.getInstance().logDebug(e.getAdvancement().getKey()); // Ignore if player is not in survival or if advancements are being ignored if (!e.getPlayer().getGameMode().equals(GameMode.SURVIVAL) || addon.getSettings().isIgnoreAdvancements()) { return; } // Check if player is in the Boxed worlds if (addon.inWorld(e.getPlayer().getWorld())) { + BentoBox.getInstance().logDebug("in world"); // Only allow members or higher to get advancements in a box if (addon.getSettings().isDenyVisitorAdvancements() && !addon.getIslands().getIslandAt(e.getPlayer().getLocation()).map(i -> i.getMemberSet().contains(e.getPlayer().getUniqueId())).orElse(false)) { + BentoBox.getInstance().logDebug("not on island"); // Remove advancement from player e.getAdvancement().getCriteria().forEach(c -> e.getPlayer().getAdvancementProgress(e.getAdvancement()).revokeCriteria(c)); @@ -103,6 +107,7 @@ public class AdvancementListener implements Listener { } // Add the advancement to the island int score = addon.getAdvManager().addAdvancement(e.getPlayer(), e.getAdvancement()); + BentoBox.getInstance().logDebug("Score for this advancement is " + score); // Tell other team players one tick after it occurs if it is something that has a score if (score != 0) { User user = User.getInstance(e.getPlayer()); diff --git a/src/main/java/world/bentobox/boxed/listeners/NewAreaListener.java b/src/main/java/world/bentobox/boxed/listeners/NewAreaListener.java index def9f5f..6424818 100644 --- a/src/main/java/world/bentobox/boxed/listeners/NewAreaListener.java +++ b/src/main/java/world/bentobox/boxed/listeners/NewAreaListener.java @@ -20,7 +20,7 @@ import org.bukkit.block.structure.Mirror; import org.bukkit.block.structure.StructureRotation; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.YamlConfiguration; -import org.bukkit.craftbukkit.v1_20_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player;