SacredRealms/SR-Game
1
0
Fork 0
Code Issues 19 Pull requests Projects 1 Releases Activity Actions

minor changes

Browse source
This commit is contained in:
unurled 2024-05-27 18:07:48 +02:00
parent eb68064f7f
commit 94e26dfef9
Signed by: unurled
GPG key ID: FDBC9CBE1F82423F
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/me/unurled/sacredrealms/sr/components/player/PlayerManager.java
View file

@ -125,12 +125,15 @@ public class PlayerManager extends Manager {
Bukkit.getServer() Bukkit.getServer()
.broadcast( .broadcast(
textComp( textComp(
"<gray>[</gray><green>+</green><gray>]</gray><white>" + e.getPlayer().getName())); "<gray>[</gray><green>+</green><gray>]</gray> <white>"
+ e.getPlayer().getName()));
} }
addPlayer(srPlayer); addPlayer(srPlayer);
e.getPlayer().getInventory().clear(); if (srPlayer.getInventory() != null) {
e.getPlayer().getInventory().setContents(srPlayer.getInventory().getContents()); e.getPlayer().getInventory().clear();
e.getPlayer().getInventory().setContents(srPlayer.getInventory().getContents());
}
// TODO: does not update when player health has changed for example // TODO: does not update when player health has changed for example
BukkitTask task = BukkitTask task =
@ -161,6 +164,7 @@ public class PlayerManager extends Manager {
.create(); .create();
String json = dh.get(PLAYER_KEY + p); String json = dh.get(PLAYER_KEY + p);
SRPlayer srPlayer = gson.fromJson(json, SRPlayer.class); SRPlayer srPlayer = gson.fromJson(json, SRPlayer.class);
if (srPlayer == null) { if (srPlayer == null) {
srPlayer = new SRPlayer(p); srPlayer = new SRPlayer(p);
} else { } else {
@ -184,7 +188,8 @@ public class PlayerManager extends Manager {
} }
removePlayer(e.getPlayer().getUniqueId()); removePlayer(e.getPlayer().getUniqueId());
Bukkit.getServer().broadcast(textComp("<gray>[<red>-<gray>] " + e.getPlayer().getName())); Bukkit.getServer()
.broadcast(textComp("<gray>[<red>-<gray>] <white>" + e.getPlayer().getName()));
} }
@EventHandler @EventHandler

2
src/main/java/me/unurled/sacredrealms/sr/components/player/SRPlayer.java
View file

@ -37,7 +37,7 @@ public class SRPlayer {
@Expose private Map<Attribute, Double> attributes = new EnumMap<>(Attribute.class); @Expose private Map<Attribute, Double> attributes = new EnumMap<>(Attribute.class);
private Map<Attribute, Map<ItemStack, Double>> itemAttributes = new EnumMap<>(Attribute.class); private Map<Attribute, Map<ItemStack, Double>> itemAttributes = new EnumMap<>(Attribute.class);
@Expose private List<PotionEffect> potionEffects = new ArrayList<>(); @Expose private List<PotionEffect> potionEffects = new ArrayList<>();
@Expose private Inventory inventory = null; @Expose private Inventory inventory;
@Expose private List<Integer> treasuresOpened = new ArrayList<>(); @Expose private List<Integer> treasuresOpened = new ArrayList<>();
private boolean isClientBuilder = false; private boolean isClientBuilder = false;
private boolean firstTime = true; private boolean firstTime = true;