PandacubeFr/PandaLib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: PandacubeFr:fcac9af7d1454d5e485d4b1a3d2b959941c24e59
Branches Tags
PandacubeFr:master
...
compare: PandacubeFr:3e6cf96040ccf017a15f93ca821fbe043108f371
Branches Tags
PandacubeFr:master

2 Commits
fcac9af7d1 ... 3e6cf96040

Author SHA1 Message Date
Marc Baloup
3e6cf96040 GameWorld loading ony runs /mvm command when Multiverse plugin is present 2024-07-19 23:12:56 +02:00
Marc Baloup
d1a04a7a66 Proper exception handling when not able to load player data file 2024-07-19 00:23:12 +02:00
3 changed files with 24 additions and 7 deletions
Show Stats Expand all files Collapse all files

17
pandalib-paper/src/main/java/fr/pandacube/lib/paper/players/PaperOffPlayer.java
View File

@ -5,6 +5,7 @@ import fr.pandacube.lib.paper.reflect.wrapper.craftbukkit.CraftServer;
import fr.pandacube.lib.paper.reflect.wrapper.minecraft.nbt.CompoundTag; import fr.pandacube.lib.paper.reflect.wrapper.minecraft.nbt.CompoundTag;
import fr.pandacube.lib.paper.reflect.wrapper.minecraft.nbt.NbtIo; import fr.pandacube.lib.paper.reflect.wrapper.minecraft.nbt.NbtIo;
import fr.pandacube.lib.paper.util.PlayerDataWrapper; import fr.pandacube.lib.paper.util.PlayerDataWrapper;
import fr.pandacube.lib.paper.util.PlayerDataWrapper.PlayerDataLoadException;
import fr.pandacube.lib.paper.world.WorldUtil; import fr.pandacube.lib.paper.world.WorldUtil;
import fr.pandacube.lib.players.standalone.AbstractOffPlayer; import fr.pandacube.lib.players.standalone.AbstractOffPlayer;
import fr.pandacube.lib.reflect.wrapper.ReflectWrapper; import fr.pandacube.lib.reflect.wrapper.ReflectWrapper;
@ -155,12 +156,16 @@ public interface PaperOffPlayer extends AbstractOffPlayer {
*/ */
default CompoundTag getPlayerData() { default CompoundTag getPlayerData() {
if (isOnline()) if (isOnline())
throw new IllegalStateException("Cannot access data file of " + getName() + " because they’re online."); throw new IllegalStateException("Cannot access data file of " + getName() + " because they're online.");
return ReflectWrapper.wrapTyped(Bukkit.getServer(), CraftServer.class) try {
.getServer() return ReflectWrapper.wrapTyped(Bukkit.getServer(), CraftServer.class)
.getPlayerList() .getServer()
.playerIo() .getPlayerList()
.load(getName(), getUniqueId().toString()).orElse(null); .playerIo()
.load(getName(), getUniqueId().toString()).orElse(null);
} catch (Exception|LinkageError e) {
throw new PlayerDataLoadException(getName(), getUniqueId(), e);
}
} }
/** /**

3
pandalib-paper/src/main/java/fr/pandacube/lib/paper/util/GameWorldUtils.java
View File

@ -103,7 +103,8 @@ public class GameWorldUtils implements Listener {
} }
w.setAutoSave(false); w.setAutoSave(false);
gameWorld.put(world, w); gameWorld.put(world, w);
Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "mvm set hidden true "+copiedName); if (Bukkit.getPluginManager().getPlugin("Multiverse-Core") != null)
Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "mvm set hidden true "+copiedName);
operationOnLoad.accept(w); operationOnLoad.accept(w);
return w; return w;
} }

11
pandalib-paper/src/main/java/fr/pandacube/lib/paper/util/PlayerDataWrapper.java
View File

@ -21,6 +21,7 @@ import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Objects; import java.util.Objects;
import java.util.TreeMap; import java.util.TreeMap;
import java.util.UUID;
import java.util.function.IntUnaryOperator; import java.util.function.IntUnaryOperator;
/** /**
@ -362,4 +363,14 @@ public record PlayerDataWrapper(CompoundTag data) {
return null; return null;
} }
} }
public static class PlayerDataLoadException extends RuntimeException {
public PlayerDataLoadException(String playerName, UUID playerId, Throwable cause) {
super("Unable to load data of player " + playerName + " (" + playerId + ")", cause);
}
}
} }