Skip to content

Update to support new gamerule naming in 1.21.11 #650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benwoo1110 merged 1 commit into from
Dec 16, 2025
Merged

Update to support new gamerule naming in 1.21.11 #650

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions src/main/java/org/mvplugins/multiverse/inventories/share/Sharables.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,10 +753,12 @@ public boolean updatePlayer(Player player, ProfileData profile) {
int totalExperience = player.getTotalExperience();
int level = player.getLevel();
float exp = player.getExp();
boolean announceAdvancements = Boolean.TRUE.equals(player.getWorld().getGameRuleValue(GameRule.ANNOUNCE_ADVANCEMENTS));
if (announceAdvancements) {
player.getWorld().setGameRule(GameRule.ANNOUNCE_ADVANCEMENTS, false);
}

boolean announceAdvancements = announceAdvancementsRule
.map(rule -> Boolean.TRUE.equals(player.getWorld().getGameRuleValue(rule)))
.filter(Boolean::booleanValue)
.map(ignore -> player.getWorld().setGameRule(announceAdvancementsRule.get(), false))
.getOrElse(false);

Bukkit.advancementIterator().forEachRemaining(advancement -> {
AdvancementProgress advancementProgress = player.getAdvancementProgress(advancement);
Expand All @@ -777,14 +779,16 @@ public boolean updatePlayer(Player player, ProfileData profile) {
player.setLevel(level);
player.setTotalExperience(totalExperience);
sendAdvancementUpdateWithoutToast.accept(player);
if (announceAdvancements) {
player.getWorld().setGameRule(GameRule.ANNOUNCE_ADVANCEMENTS, true);
if (announceAdvancements && announceAdvancementsRule.isDefined()) {
announceAdvancementsRule
.peek(rule -> player.getWorld().setGameRule(rule, true));
}

return advancements != null;
}
}).defaultSerializer(new ProfileEntry(false, "advancements")).altName("achievements").optional().build();

private static final Option<GameRule<Boolean>> announceAdvancementsRule;
private static final Consumer<Player> sendAdvancementUpdateWithoutToast;

static {
Expand All @@ -804,6 +808,13 @@ public boolean updatePlayer(Player player, ProfileData profile) {
Try.of(() -> method.invoke(serverPlayer)).toOption())
.flatMap(playerAdvancements -> flushDirtyMethod.flatMap(method ->
Try.of(() -> method.invoke(playerAdvancements, serverPlayer, false)).toOption())));

//todo use 1.21.11+ Registry lookup for gamerule instead of getByName
@SuppressWarnings("unchecked")
Option<GameRule<Boolean>> rule = Try.of(() -> Option.of((GameRule<Boolean>) GameRule.getByName("announceAdvancements"))
.getOrElse(() -> (GameRule<Boolean>) GameRule.getByName("minecraft:show_advancement_messages")))
.toOption();
announceAdvancementsRule = rule;
}

/**
Expand Down
Loading