Upstream/BlueMap
1
0
Fork 0
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git synced 2024-12-27 19:37:42 +01:00
Code Issues Projects Releases Wiki Activity

Fix possible NPE and the forge-server instance never being initialized

Browse Source
This commit is contained in:
Blue (Lukas Rieger) 2020-08-30 20:52:30 +02:00
parent 0559df9730
commit cd24f57031
10 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/live/LiveAPIRequestHandler.java
View File

@ -100,6 +100,7 @@ public HttpResponse handlePlayersRequest(HttpRequest request) {
json.beginObject();
json.name("players").beginArray();
for (Player player : server.getOnlinePlayers()) {
if (!player.isOnline()) continue;
if (config.isHideInvisible() && player.isInvisible()) continue;
if (config.isHideSneaking() && player.isSneaking()) continue;
@ -116,6 +117,7 @@ public HttpResponse handlePlayersRequest(HttpRequest request) {
json.endObject();
json.endObject();
}
json.endArray();
json.endObject();

1
implementations/fabric-1.15.2/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java
View File

@ -129,6 +129,7 @@ public void update() {
}
this.gamemode = GAMEMODE_MAP.get(player.interactionManager.getGameMode());
if (this.gamemode == null) this.gamemode = Gamemode.SURVIVAL;
StatusEffectInstance invis = player.getStatusEffect(StatusEffects.INVISIBILITY);
this.invisible = invis != null && invis.getDuration() > 0;

1
implementations/fabric-1.16.1/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java
View File

@ -129,6 +129,7 @@ public void update() {
}
this.gamemode = GAMEMODE_MAP.get(player.interactionManager.getGameMode());
if (this.gamemode == null) this.gamemode = Gamemode.SURVIVAL;
StatusEffectInstance invis = player.getStatusEffect(StatusEffects.INVISIBILITY);
this.invisible = invis != null && invis.getDuration() > 0;

1
implementations/fabric-1.16.2/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java
View File

@ -129,6 +129,7 @@ public void update() {
}
this.gamemode = GAMEMODE_MAP.get(player.interactionManager.getGameMode());
if (this.gamemode == null) this.gamemode = Gamemode.SURVIVAL;
StatusEffectInstance invis = player.getStatusEffect(StatusEffects.INVISIBILITY);
this.invisible = invis != null && invis.getDuration() > 0;

1
implementations/forge-1.14.4/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java
View File

@ -129,6 +129,7 @@ public void update() {
}
this.gamemode = GAMEMODE_MAP.get(player.interactionManager.getGameType());
if (this.gamemode == null) this.gamemode = Gamemode.SURVIVAL;
EffectInstance invis = player.getActivePotionEffect(Effects.INVISIBILITY);
this.invisible = invis != null && invis.getDuration() > 0;

1
implementations/forge-1.15.2/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java
View File

@ -129,6 +129,7 @@ public void update() {
}
this.gamemode = GAMEMODE_MAP.get(player.interactionManager.getGameType());
if (this.gamemode == null) this.gamemode = Gamemode.SURVIVAL;
EffectInstance invis = player.getActivePotionEffect(Effects.INVISIBILITY);
this.invisible = invis != null && invis.getDuration() > 0;

3
implementations/forge-1.16.2/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java
View File

@ -98,12 +98,13 @@ public ForgeMod() {
@SubscribeEvent
public void onServerStarting(FMLServerStartingEvent event) {
this.worldUUIDs.clear();
this.serverInstance = event.getServer();
//register commands
new Commands<>(pluginInstance, event.getServer().getCommandManager().getDispatcher(), forgeSource -> new ForgeCommandSource(this, pluginInstance, forgeSource));
//save worlds to generate level.dat files
event.getServer().save(false, true, true);
serverInstance.save(false, true, true);
new Thread(() -> {
Logger.global.logInfo("Loading...");

1
implementations/forge-1.16.2/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java
View File

@ -128,6 +128,7 @@ public void update() {
}
this.gamemode = GAMEMODE_MAP.get(player.interactionManager.getGameType());
if (this.gamemode == null) this.gamemode = Gamemode.SURVIVAL;
EffectInstance invis = player.getActivePotionEffect(Effects.INVISIBILITY);
this.invisible = invis != null && invis.getDuration() > 0;

1
implementations/spigot/src/main/java/de/bluecolored/bluemap/bukkit/BukkitPlayer.java
View File

@ -114,6 +114,7 @@ public void update() {
}
this.gamemode = GAMEMODE_MAP.get(player.getGameMode());
if (this.gamemode == null) this.gamemode = Gamemode.SURVIVAL;
this.invisible = player.hasPotionEffect(PotionEffectType.INVISIBILITY);

1
implementations/sponge-7.2.0/src/main/java/de/bluecolored/bluemap/sponge/SpongePlayer.java
View File

@ -119,6 +119,7 @@ public void update() {
}
this.gamemode = GAMEMODE_MAP.get(player.get(Keys.GAME_MODE).orElse(GameModes.NOT_SET));
if (this.gamemode == null) this.gamemode = Gamemode.SURVIVAL;
boolean invis = player.get(Keys.VANISH).orElse(false);
if (!invis && player.get(Keys.INVISIBLE).orElse(false)) invis = true;