Send advancement updates without client toast during share handling

Author: benwoo1110

src/main/java/org/mvplugins/multiverse/inventories/share/Sharables.java

@@ -7,7 +7,6 @@
 import org.bukkit.World;
 import org.bukkit.advancement.AdvancementProgress;
 import org.bukkit.inventory.Inventory;
-import org.jetbrains.annotations.ApiStatus;
 import org.mvplugins.multiverse.core.economy.MVEconomist;
 import org.mvplugins.multiverse.core.teleportation.AsyncSafetyTeleporter;
 import org.mvplugins.multiverse.core.utils.ReflectHelper;
@@ -33,6 +32,7 @@
 import org.bukkit.potion.PotionEffect;
 import org.mvplugins.multiverse.inventories.util.RespawnLocation;
 
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -45,7 +45,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
-import java.util.UUID;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 import static org.mvplugins.multiverse.inventories.util.MinecraftTools.findBedFromRespawnLocation;
@@ -776,6 +776,7 @@ public boolean updatePlayer(Player player, ProfileData profile) {
                     player.setExp(exp);
                     player.setLevel(level);
                     player.setTotalExperience(totalExperience);
+                    sendAdvancementUpdateWithoutToast.accept(player);
                     if (announceAdvancements) {
                         player.getWorld().setGameRule(GameRule.ANNOUNCE_ADVANCEMENTS, true);
                     }
@@ -784,6 +785,27 @@ public boolean updatePlayer(Player player, ProfileData profile) {
                 }
             }).defaultSerializer(new ProfileEntry(false, "advancements")).altName("achievements").optional().build();
 
+    private static final Consumer<Player> sendAdvancementUpdateWithoutToast;
+
+    static {
+        // use reflection to send advancement update without client toast
+        // should work 1.21.5+ papermc unless Mojang changes things again
+        Option<Class<?>> craftPlayerClass = Option.of(ReflectHelper.getClass("org.bukkit.craftbukkit.entity.CraftPlayer"));
+        Option<Method> getHandleMethod = craftPlayerClass.map(cls -> ReflectHelper.getMethod(cls, "getHandle"));
+        Option<Class<?>> serverPlayerClass = Option.of(ReflectHelper.getClass("net.minecraft.server.level.ServerPlayer"));
+        Option<Method> getAdvancementsMethod = serverPlayerClass.map(cls -> ReflectHelper.getMethod(cls, "getAdvancements"));
+        Option<Class<?>> playerAdvancementsClass = Option.of(ReflectHelper.getClass("net.minecraft.server.PlayerAdvancements"));
+        Option<Method> flushDirtyMethod = playerAdvancementsClass.flatMap(cls ->
+                serverPlayerClass.map(cls2 -> ReflectHelper.getMethod(cls, "flushDirty", cls2, boolean.class)));
+
+        sendAdvancementUpdateWithoutToast = player -> getHandleMethod.flatMap(method ->
+                        Try.of(() -> method.invoke(player)).toOption())
+                .flatMap(serverPlayer -> getAdvancementsMethod.flatMap(method ->
+                                Try.of(() -> method.invoke(serverPlayer)).toOption())
+                        .flatMap(playerAdvancements -> flushDirtyMethod.flatMap(method ->
+                                Try.of(() -> method.invoke(playerAdvancements, serverPlayer, false)).toOption())));
+    }
+
     /**
      * Sharing Statistics.
      */