Upstream/BlueMap
1
0
Fork 0
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git synced 2024-06-26 06:24:57 +02:00
Code Issues Projects Releases Wiki Activity

Fix #338

Browse Source
This commit is contained in:
Lukas Rieger (Blue) 2022-10-10 17:46:57 +02:00
parent a8346a24ba
commit 50c950382e
No known key found for this signature in database
GPG Key ID: 2D09EC5ED2687FF2
29 changed files with 91 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
implementations/fabric-1.15.2/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java
View File

@ -187,7 +187,7 @@ public Optional<Path> getModsFolder() {
public void onPlayerJoin(MinecraftServer server, ServerPlayerEntity playerInstance) { public void onPlayerJoin(MinecraftServer server, ServerPlayerEntity playerInstance) {
if (this.serverInstance != server) return; if (this.serverInstance != server) return;
FabricPlayer player = new FabricPlayer(playerInstance.getUuid(), this, pluginInstance.getBlueMap()); FabricPlayer player = new FabricPlayer(playerInstance.getUuid(), this);
onlinePlayerMap.put(player.getUuid(), player); onlinePlayerMap.put(player.getUuid(), player);
onlinePlayerList.add(player); onlinePlayerList.add(player);
} }
@ -206,6 +206,10 @@ public MinecraftServer getServer() {
return this.serverInstance; return this.serverInstance;
} }
public Plugin getPluginInstance() {
return pluginInstance;
}
@Override @Override
public Collection<Player> getOnlinePlayers() { public Collection<Player> getOnlinePlayers() {
return onlinePlayerMap.values(); return onlinePlayerMap.values();

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

@ -25,10 +25,9 @@
package de.bluecolored.bluemap.fabric; package de.bluecolored.bluemap.fabric;
import com.flowpowered.math.vector.Vector3d; import com.flowpowered.math.vector.Vector3d;
import de.bluecolored.bluemap.common.BlueMapService; import de.bluecolored.bluemap.common.plugin.text.Text;
import de.bluecolored.bluemap.common.serverinterface.Gamemode; import de.bluecolored.bluemap.common.serverinterface.Gamemode;
import de.bluecolored.bluemap.common.serverinterface.Player; import de.bluecolored.bluemap.common.serverinterface.Player;
import de.bluecolored.bluemap.common.plugin.text.Text;
import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffectInstance;
import net.minecraft.entity.effect.StatusEffects; import net.minecraft.entity.effect.StatusEffects;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
@ -66,12 +65,10 @@ public class FabricPlayer implements Player {
private Gamemode gamemode; private Gamemode gamemode;
private final FabricMod mod; private final FabricMod mod;
private final BlueMapService blueMap;
public FabricPlayer(UUID playerUuid, FabricMod mod, BlueMapService blueMap) { public FabricPlayer(UUID playerUuid, FabricMod mod) {
this.uuid = playerUuid; this.uuid = playerUuid;
this.mod = mod; this.mod = mod;
this.blueMap = blueMap;
update(); update();
} }
@ -166,8 +163,8 @@ public void update() {
try { try {
var world = mod.getWorld(player.getServerWorld()); var world = mod.getWorld(player.getServerWorld());
this.world = blueMap.getWorldId(world.getSaveFolder()); this.world = mod.getPluginInstance().getBlueMap().getWorldId(world.getSaveFolder());
} catch (IOException e) { } catch (IOException | NullPointerException e) { // NullPointerException -> the plugin isn't fully loaded
this.world = "unknown"; this.world = "unknown";
} }
} }

6
implementations/fabric-1.16.1/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java
View File

@ -186,7 +186,7 @@ public Optional<Path> getModsFolder() {
public void onPlayerJoin(MinecraftServer server, ServerPlayerEntity playerInstance) { public void onPlayerJoin(MinecraftServer server, ServerPlayerEntity playerInstance) {
if (this.serverInstance != server) return; if (this.serverInstance != server) return;
FabricPlayer player = new FabricPlayer(playerInstance.getUuid(), this, pluginInstance.getBlueMap()); FabricPlayer player = new FabricPlayer(playerInstance.getUuid(), this);
onlinePlayerMap.put(player.getUuid(), player); onlinePlayerMap.put(player.getUuid(), player);
onlinePlayerList.add(player); onlinePlayerList.add(player);
} }
@ -205,6 +205,10 @@ public MinecraftServer getServer() {
return this.serverInstance; return this.serverInstance;
} }
public Plugin getPluginInstance() {
return pluginInstance;
}
@Override @Override
public Collection<Player> getOnlinePlayers() { public Collection<Player> getOnlinePlayers() {
return onlinePlayerMap.values(); return onlinePlayerMap.values();

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

@ -25,10 +25,9 @@
package de.bluecolored.bluemap.fabric; package de.bluecolored.bluemap.fabric;
import com.flowpowered.math.vector.Vector3d; import com.flowpowered.math.vector.Vector3d;
import de.bluecolored.bluemap.common.BlueMapService; import de.bluecolored.bluemap.common.plugin.text.Text;
import de.bluecolored.bluemap.common.serverinterface.Gamemode; import de.bluecolored.bluemap.common.serverinterface.Gamemode;
import de.bluecolored.bluemap.common.serverinterface.Player; import de.bluecolored.bluemap.common.serverinterface.Player;
import de.bluecolored.bluemap.common.plugin.text.Text;
import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffectInstance;
import net.minecraft.entity.effect.StatusEffects; import net.minecraft.entity.effect.StatusEffects;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
@ -66,12 +65,10 @@ public class FabricPlayer implements Player {
private Gamemode gamemode; private Gamemode gamemode;
private final FabricMod mod; private final FabricMod mod;
private final BlueMapService blueMap;
public FabricPlayer(UUID playerUuid, FabricMod mod, BlueMapService blueMap) { public FabricPlayer(UUID playerUuid, FabricMod mod) {
this.uuid = playerUuid; this.uuid = playerUuid;
this.mod = mod; this.mod = mod;
this.blueMap = blueMap;
update(); update();
} }
@ -166,8 +163,8 @@ public void update() {
try { try {
var world = mod.getWorld(player.getServerWorld()); var world = mod.getWorld(player.getServerWorld());
this.world = blueMap.getWorldId(world.getSaveFolder()); this.world = mod.getPluginInstance().getBlueMap().getWorldId(world.getSaveFolder());
} catch (IOException e) { } catch (IOException | NullPointerException e) { // NullPointerException -> the plugin isn't fully loaded
this.world = "unknown"; this.world = "unknown";
} }
} }

6
implementations/fabric-1.16.2/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java
View File

@ -186,7 +186,7 @@ public Optional<Path> getModsFolder() {
public void onPlayerJoin(MinecraftServer server, ServerPlayerEntity playerInstance) { public void onPlayerJoin(MinecraftServer server, ServerPlayerEntity playerInstance) {
if (this.serverInstance != server) return; if (this.serverInstance != server) return;
FabricPlayer player = new FabricPlayer(playerInstance.getUuid(), this, pluginInstance.getBlueMap()); FabricPlayer player = new FabricPlayer(playerInstance.getUuid(), this);
onlinePlayerMap.put(player.getUuid(), player); onlinePlayerMap.put(player.getUuid(), player);
onlinePlayerList.add(player); onlinePlayerList.add(player);
} }
@ -205,6 +205,10 @@ public MinecraftServer getServer() {
return this.serverInstance; return this.serverInstance;
} }
public Plugin getPluginInstance() {
return pluginInstance;
}
@Override @Override
public Collection<Player> getOnlinePlayers() { public Collection<Player> getOnlinePlayers() {
return onlinePlayerMap.values(); return onlinePlayerMap.values();

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

@ -25,10 +25,9 @@
package de.bluecolored.bluemap.fabric; package de.bluecolored.bluemap.fabric;
import com.flowpowered.math.vector.Vector3d; import com.flowpowered.math.vector.Vector3d;
import de.bluecolored.bluemap.common.BlueMapService; import de.bluecolored.bluemap.common.plugin.text.Text;
import de.bluecolored.bluemap.common.serverinterface.Gamemode; import de.bluecolored.bluemap.common.serverinterface.Gamemode;
import de.bluecolored.bluemap.common.serverinterface.Player; import de.bluecolored.bluemap.common.serverinterface.Player;
import de.bluecolored.bluemap.common.plugin.text.Text;
import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffectInstance;
import net.minecraft.entity.effect.StatusEffects; import net.minecraft.entity.effect.StatusEffects;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
@ -66,12 +65,10 @@ public class FabricPlayer implements Player {
private Gamemode gamemode; private Gamemode gamemode;
private final FabricMod mod; private final FabricMod mod;
private final BlueMapService blueMap;
public FabricPlayer(UUID playerUuid, FabricMod mod, BlueMapService blueMap) { public FabricPlayer(UUID playerUuid, FabricMod mod) {
this.uuid = playerUuid; this.uuid = playerUuid;
this.mod = mod; this.mod = mod;
this.blueMap = blueMap;
update(); update();
} }
@ -166,8 +163,8 @@ public void update() {
try { try {
var world = mod.getWorld(player.getServerWorld()); var world = mod.getWorld(player.getServerWorld());
this.world = blueMap.getWorldId(world.getSaveFolder()); this.world = mod.getPluginInstance().getBlueMap().getWorldId(world.getSaveFolder());
} catch (IOException e) { } catch (IOException | NullPointerException e) { // NullPointerException -> the plugin isn't fully loaded
this.world = "unknown"; this.world = "unknown";
} }
} }

6
implementations/fabric-1.17/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java
View File

@ -186,7 +186,7 @@ public Optional<Path> getModsFolder() {
public void onPlayerJoin(MinecraftServer server, ServerPlayerEntity playerInstance) { public void onPlayerJoin(MinecraftServer server, ServerPlayerEntity playerInstance) {
if (this.serverInstance != server) return; if (this.serverInstance != server) return;
FabricPlayer player = new FabricPlayer(playerInstance.getUuid(), this, pluginInstance.getBlueMap()); FabricPlayer player = new FabricPlayer(playerInstance.getUuid(), this);
onlinePlayerMap.put(player.getUuid(), player); onlinePlayerMap.put(player.getUuid(), player);
onlinePlayerList.add(player); onlinePlayerList.add(player);
} }
@ -205,6 +205,10 @@ public MinecraftServer getServer() {
return this.serverInstance; return this.serverInstance;
} }
public Plugin getPluginInstance() {
return pluginInstance;
}
@Override @Override
public Collection<Player> getOnlinePlayers() { public Collection<Player> getOnlinePlayers() {
return onlinePlayerMap.values(); return onlinePlayerMap.values();

11
implementations/fabric-1.17/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java
View File

@ -25,10 +25,9 @@
package de.bluecolored.bluemap.fabric; package de.bluecolored.bluemap.fabric;
import com.flowpowered.math.vector.Vector3d; import com.flowpowered.math.vector.Vector3d;
import de.bluecolored.bluemap.common.BlueMapService; import de.bluecolored.bluemap.common.plugin.text.Text;
import de.bluecolored.bluemap.common.serverinterface.Gamemode; import de.bluecolored.bluemap.common.serverinterface.Gamemode;
import de.bluecolored.bluemap.common.serverinterface.Player; import de.bluecolored.bluemap.common.serverinterface.Player;
import de.bluecolored.bluemap.common.plugin.text.Text;
import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffectInstance;
import net.minecraft.entity.effect.StatusEffects; import net.minecraft.entity.effect.StatusEffects;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
@ -65,12 +64,10 @@ public class FabricPlayer implements Player {
private Gamemode gamemode; private Gamemode gamemode;
private final FabricMod mod; private final FabricMod mod;
private final BlueMapService blueMap;
public FabricPlayer(UUID playerUuid, FabricMod mod, BlueMapService blueMap) { public FabricPlayer(UUID playerUuid, FabricMod mod) {
this.uuid = playerUuid; this.uuid = playerUuid;
this.mod = mod; this.mod = mod;
this.blueMap = blueMap;
update(); update();
} }
@ -165,8 +162,8 @@ public void update() {
try { try {
var world = mod.getWorld(player.getServerWorld()); var world = mod.getWorld(player.getServerWorld());
this.world = blueMap.getWorldId(world.getSaveFolder()); this.world = mod.getPluginInstance().getBlueMap().getWorldId(world.getSaveFolder());
} catch (IOException e) { } catch (IOException | NullPointerException e) { // NullPointerException -> the plugin isn't fully loaded
this.world = "unknown"; this.world = "unknown";
} }
} }

6
implementations/fabric-1.18/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java
View File

@ -186,7 +186,7 @@ public Optional<Path> getModsFolder() {
public void onPlayerJoin(MinecraftServer server, ServerPlayerEntity playerInstance) { public void onPlayerJoin(MinecraftServer server, ServerPlayerEntity playerInstance) {
if (this.serverInstance != server) return; if (this.serverInstance != server) return;
FabricPlayer player = new FabricPlayer(playerInstance.getUuid(), this, pluginInstance.getBlueMap()); FabricPlayer player = new FabricPlayer(playerInstance.getUuid(), this);
onlinePlayerMap.put(player.getUuid(), player); onlinePlayerMap.put(player.getUuid(), player);
onlinePlayerList.add(player); onlinePlayerList.add(player);
} }
@ -205,6 +205,10 @@ public MinecraftServer getServer() {
return this.serverInstance; return this.serverInstance;
} }
public Plugin getPluginInstance() {
return pluginInstance;
}
@Override @Override
public Collection<Player> getOnlinePlayers() { public Collection<Player> getOnlinePlayers() {
return onlinePlayerMap.values(); return onlinePlayerMap.values();

11
implementations/fabric-1.18/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java
View File

@ -25,10 +25,9 @@
package de.bluecolored.bluemap.fabric; package de.bluecolored.bluemap.fabric;
import com.flowpowered.math.vector.Vector3d; import com.flowpowered.math.vector.Vector3d;
import de.bluecolored.bluemap.common.BlueMapService; import de.bluecolored.bluemap.common.plugin.text.Text;
import de.bluecolored.bluemap.common.serverinterface.Gamemode; import de.bluecolored.bluemap.common.serverinterface.Gamemode;
import de.bluecolored.bluemap.common.serverinterface.Player; import de.bluecolored.bluemap.common.serverinterface.Player;
import de.bluecolored.bluemap.common.plugin.text.Text;
import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffectInstance;
import net.minecraft.entity.effect.StatusEffects; import net.minecraft.entity.effect.StatusEffects;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
@ -65,12 +64,10 @@ public class FabricPlayer implements Player {
private Gamemode gamemode; private Gamemode gamemode;
private final FabricMod mod; private final FabricMod mod;
private final BlueMapService blueMap;
public FabricPlayer(UUID playerUuid, FabricMod mod, BlueMapService blueMap) { public FabricPlayer(UUID playerUuid, FabricMod mod) {
this.uuid = playerUuid; this.uuid = playerUuid;
this.mod = mod; this.mod = mod;
this.blueMap = blueMap;
update(); update();
} }
@ -165,8 +162,8 @@ public void update() {
try { try {
var world = mod.getWorld(player.getWorld()); var world = mod.getWorld(player.getWorld());
this.world = blueMap.getWorldId(world.getSaveFolder()); this.world = mod.getPluginInstance().getBlueMap().getWorldId(world.getSaveFolder());
} catch (IOException e) { } catch (IOException | NullPointerException e) { // NullPointerException -> the plugin isn't fully loaded
this.world = "unknown"; this.world = "unknown";
} }
} }

6
implementations/fabric-1.19/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java
View File

@ -191,7 +191,7 @@ public Optional<Path> getModsFolder() {
public void onPlayerJoin(MinecraftServer server, ServerPlayerEntity playerInstance) { public void onPlayerJoin(MinecraftServer server, ServerPlayerEntity playerInstance) {
if (this.serverInstance != server) return; if (this.serverInstance != server) return;
FabricPlayer player = new FabricPlayer(playerInstance.getUuid(), this, pluginInstance.getBlueMap()); FabricPlayer player = new FabricPlayer(playerInstance.getUuid(), this);
onlinePlayerMap.put(player.getUuid(), player); onlinePlayerMap.put(player.getUuid(), player);
onlinePlayerList.add(player); onlinePlayerList.add(player);
} }
@ -210,6 +210,10 @@ public MinecraftServer getServer() {
return this.serverInstance; return this.serverInstance;
} }
public Plugin getPluginInstance() {
return pluginInstance;
}
@Override @Override
public Collection<Player> getOnlinePlayers() { public Collection<Player> getOnlinePlayers() {
return onlinePlayerMap.values(); return onlinePlayerMap.values();

11
implementations/fabric-1.19/src/main/java/de/bluecolored/bluemap/fabric/FabricPlayer.java
View File

@ -25,10 +25,9 @@
package de.bluecolored.bluemap.fabric; package de.bluecolored.bluemap.fabric;
import com.flowpowered.math.vector.Vector3d; import com.flowpowered.math.vector.Vector3d;
import de.bluecolored.bluemap.common.BlueMapService; import de.bluecolored.bluemap.common.plugin.text.Text;
import de.bluecolored.bluemap.common.serverinterface.Gamemode; import de.bluecolored.bluemap.common.serverinterface.Gamemode;
import de.bluecolored.bluemap.common.serverinterface.Player; import de.bluecolored.bluemap.common.serverinterface.Player;
import de.bluecolored.bluemap.common.plugin.text.Text;
import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffectInstance;
import net.minecraft.entity.effect.StatusEffects; import net.minecraft.entity.effect.StatusEffects;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
@ -65,12 +64,10 @@ public class FabricPlayer implements Player {
private Gamemode gamemode; private Gamemode gamemode;
private final FabricMod mod; private final FabricMod mod;
private final BlueMapService blueMap;
public FabricPlayer(UUID playerUuid, FabricMod mod, BlueMapService blueMap) { public FabricPlayer(UUID playerUuid, FabricMod mod) {
this.uuid = playerUuid; this.uuid = playerUuid;
this.mod = mod; this.mod = mod;
this.blueMap = blueMap;
update(); update();
} }
@ -165,8 +162,8 @@ public void update() {
try { try {
var world = mod.getWorld(player.getWorld()); var world = mod.getWorld(player.getWorld());
this.world = blueMap.getWorldId(world.getSaveFolder()); this.world = mod.getPluginInstance().getBlueMap().getWorldId(world.getSaveFolder());
} catch (IOException e) { } catch (IOException | NullPointerException e) { // NullPointerException -> the plugin isn't fully loaded
this.world = "unknown"; this.world = "unknown";
} }
} }

2
implementations/forge-1.14.4/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java
View File

@ -205,7 +205,7 @@ public void onPlayerJoin(PlayerLoggedInEvent evt) {
PlayerEntity playerInstance = evt.getPlayer(); PlayerEntity playerInstance = evt.getPlayer();
if (!(playerInstance instanceof ServerPlayerEntity)) return; if (!(playerInstance instanceof ServerPlayerEntity)) return;
ForgePlayer player = new ForgePlayer(playerInstance.getUniqueID(), this, getPlugin().getBlueMap()); ForgePlayer player = new ForgePlayer(playerInstance.getUniqueID(), this);
onlinePlayerMap.put(player.getUuid(), player); onlinePlayerMap.put(player.getUuid(), player);
onlinePlayerList.add(player); onlinePlayerList.add(player);
} }

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

@ -25,10 +25,9 @@
package de.bluecolored.bluemap.forge; package de.bluecolored.bluemap.forge;
import com.flowpowered.math.vector.Vector3d; import com.flowpowered.math.vector.Vector3d;
import de.bluecolored.bluemap.common.BlueMapService; import de.bluecolored.bluemap.common.plugin.text.Text;
import de.bluecolored.bluemap.common.serverinterface.Gamemode; import de.bluecolored.bluemap.common.serverinterface.Gamemode;
import de.bluecolored.bluemap.common.serverinterface.Player; import de.bluecolored.bluemap.common.serverinterface.Player;
import de.bluecolored.bluemap.common.plugin.text.Text;
import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.potion.EffectInstance; import net.minecraft.potion.EffectInstance;
import net.minecraft.potion.Effects; import net.minecraft.potion.Effects;
@ -66,12 +65,10 @@ public class ForgePlayer implements Player {
private Gamemode gamemode; private Gamemode gamemode;
private final ForgeMod mod; private final ForgeMod mod;
private final BlueMapService blueMap;
public ForgePlayer(UUID playerUuid, ForgeMod mod, BlueMapService blueMap) { public ForgePlayer(UUID playerUuid, ForgeMod mod) {
this.uuid = playerUuid; this.uuid = playerUuid;
this.mod = mod; this.mod = mod;
this.blueMap = blueMap;
update(); update();
} }
@ -166,8 +163,8 @@ public void update() {
try { try {
var world = mod.getWorld(player.getServerWorld()); var world = mod.getWorld(player.getServerWorld());
this.world = blueMap.getWorldId(world.getSaveFolder()); this.world = mod.getPlugin().getBlueMap().getWorldId(world.getSaveFolder());
} catch (IOException e) { } catch (IOException | NullPointerException e) { // NullPointerException -> the plugin isn't fully loaded
this.world = "unknown"; this.world = "unknown";
} }
} }

2
implementations/forge-1.15.2/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java
View File

@ -205,7 +205,7 @@ public void onPlayerJoin(PlayerLoggedInEvent evt) {
PlayerEntity playerInstance = evt.getPlayer(); PlayerEntity playerInstance = evt.getPlayer();
if (!(playerInstance instanceof ServerPlayerEntity)) return; if (!(playerInstance instanceof ServerPlayerEntity)) return;
ForgePlayer player = new ForgePlayer(playerInstance.getUniqueID(), this, getPlugin().getBlueMap()); ForgePlayer player = new ForgePlayer(playerInstance.getUniqueID(), this);
onlinePlayerMap.put(player.getUuid(), player); onlinePlayerMap.put(player.getUuid(), player);
onlinePlayerList.add(player); onlinePlayerList.add(player);
} }

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

@ -25,10 +25,9 @@
package de.bluecolored.bluemap.forge; package de.bluecolored.bluemap.forge;
import com.flowpowered.math.vector.Vector3d; import com.flowpowered.math.vector.Vector3d;
import de.bluecolored.bluemap.common.BlueMapService; import de.bluecolored.bluemap.common.plugin.text.Text;
import de.bluecolored.bluemap.common.serverinterface.Gamemode; import de.bluecolored.bluemap.common.serverinterface.Gamemode;
import de.bluecolored.bluemap.common.serverinterface.Player; import de.bluecolored.bluemap.common.serverinterface.Player;
import de.bluecolored.bluemap.common.plugin.text.Text;
import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.potion.EffectInstance; import net.minecraft.potion.EffectInstance;
import net.minecraft.potion.Effects; import net.minecraft.potion.Effects;
@ -66,12 +65,10 @@ public class ForgePlayer implements Player {
private Gamemode gamemode; private Gamemode gamemode;
private final ForgeMod mod; private final ForgeMod mod;
private final BlueMapService blueMap;
public ForgePlayer(UUID playerUuid, ForgeMod mod, BlueMapService blueMap) { public ForgePlayer(UUID playerUuid, ForgeMod mod) {
this.uuid = playerUuid; this.uuid = playerUuid;
this.mod = mod; this.mod = mod;
this.blueMap = blueMap;
update(); update();
} }
@ -166,7 +163,7 @@ public void update() {
try { try {
var world = mod.getWorld(player.getServerWorld()); var world = mod.getWorld(player.getServerWorld());
this.world = blueMap.getWorldId(world.getSaveFolder()); this.world = mod.getPlugin().getBlueMap().getWorldId(world.getSaveFolder());
} catch (IOException e) { } catch (IOException e) {
this.world = "unknown"; this.world = "unknown";
} }

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

@ -205,7 +205,7 @@ public void onPlayerJoin(PlayerLoggedInEvent evt) {
PlayerEntity playerInstance = evt.getPlayer(); PlayerEntity playerInstance = evt.getPlayer();
if (!(playerInstance instanceof ServerPlayerEntity)) return; if (!(playerInstance instanceof ServerPlayerEntity)) return;
ForgePlayer player = new ForgePlayer(playerInstance.getUniqueID(), this, getPlugin().getBlueMap()); ForgePlayer player = new ForgePlayer(playerInstance.getUniqueID(), this);
onlinePlayerMap.put(player.getUuid(), player); onlinePlayerMap.put(player.getUuid(), player);
onlinePlayerList.add(player); onlinePlayerList.add(player);
} }

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

@ -25,10 +25,9 @@
package de.bluecolored.bluemap.forge; package de.bluecolored.bluemap.forge;
import com.flowpowered.math.vector.Vector3d; import com.flowpowered.math.vector.Vector3d;
import de.bluecolored.bluemap.common.BlueMapService; import de.bluecolored.bluemap.common.plugin.text.Text;
import de.bluecolored.bluemap.common.serverinterface.Gamemode; import de.bluecolored.bluemap.common.serverinterface.Gamemode;
import de.bluecolored.bluemap.common.serverinterface.Player; import de.bluecolored.bluemap.common.serverinterface.Player;
import de.bluecolored.bluemap.common.plugin.text.Text;
import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.potion.EffectInstance; import net.minecraft.potion.EffectInstance;
import net.minecraft.potion.Effects; import net.minecraft.potion.Effects;
@ -66,12 +65,10 @@ public class ForgePlayer implements Player {
private Gamemode gamemode; private Gamemode gamemode;
private final ForgeMod mod; private final ForgeMod mod;
private final BlueMapService blueMap;
public ForgePlayer(UUID playerUuid, ForgeMod mod, BlueMapService blueMap) { public ForgePlayer(UUID playerUuid, ForgeMod mod) {
this.uuid = playerUuid; this.uuid = playerUuid;
this.mod = mod; this.mod = mod;
this.blueMap = blueMap;
update(); update();
} }
@ -166,8 +163,8 @@ public void update() {
try { try {
var world = mod.getWorld(player.getServerWorld()); var world = mod.getWorld(player.getServerWorld());
this.world = blueMap.getWorldId(world.getSaveFolder()); this.world = mod.getPlugin().getBlueMap().getWorldId(world.getSaveFolder());
} catch (IOException e) { } catch (IOException | NullPointerException e) { // NullPointerException -> the plugin isn't fully loaded
this.world = "unknown"; this.world = "unknown";
} }
} }

2
implementations/forge-1.17.1/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java
View File

@ -204,7 +204,7 @@ public void onPlayerJoin(PlayerLoggedInEvent evt) {
var playerInstance = evt.getPlayer(); var playerInstance = evt.getPlayer();
if (!(playerInstance instanceof ServerPlayer)) return; if (!(playerInstance instanceof ServerPlayer)) return;
ForgePlayer player = new ForgePlayer(playerInstance.getUUID(), this, getPlugin().getBlueMap()); ForgePlayer player = new ForgePlayer(playerInstance.getUUID(), this);
onlinePlayerMap.put(player.getUuid(), player); onlinePlayerMap.put(player.getUuid(), player);
onlinePlayerList.add(player); onlinePlayerList.add(player);
} }

11
implementations/forge-1.17.1/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java
View File

@ -25,10 +25,9 @@
package de.bluecolored.bluemap.forge; package de.bluecolored.bluemap.forge;
import com.flowpowered.math.vector.Vector3d; import com.flowpowered.math.vector.Vector3d;
import de.bluecolored.bluemap.common.BlueMapService; import de.bluecolored.bluemap.common.plugin.text.Text;
import de.bluecolored.bluemap.common.serverinterface.Gamemode; import de.bluecolored.bluemap.common.serverinterface.Gamemode;
import de.bluecolored.bluemap.common.serverinterface.Player; import de.bluecolored.bluemap.common.serverinterface.Player;
import de.bluecolored.bluemap.common.plugin.text.Text;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
@ -66,12 +65,10 @@ public class ForgePlayer implements Player {
private Gamemode gamemode; private Gamemode gamemode;
private final ForgeMod mod; private final ForgeMod mod;
private final BlueMapService blueMap;
public ForgePlayer(UUID playerUuid, ForgeMod mod, BlueMapService blueMap) { public ForgePlayer(UUID playerUuid, ForgeMod mod) {
this.uuid = playerUuid; this.uuid = playerUuid;
this.mod = mod; this.mod = mod;
this.blueMap = blueMap;
update(); update();
} }
@ -166,8 +163,8 @@ public void update() {
try { try {
var world = mod.getWorld(player.getLevel()); var world = mod.getWorld(player.getLevel());
this.world = blueMap.getWorldId(world.getSaveFolder()); this.world = mod.getPlugin().getBlueMap().getWorldId(world.getSaveFolder());
} catch (IOException e) { } catch (IOException | NullPointerException e) { // NullPointerException -> the plugin isn't fully loaded
this.world = "unknown"; this.world = "unknown";
} }
} }

2
implementations/forge-1.18.1/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java
View File

@ -204,7 +204,7 @@ public void onPlayerJoin(PlayerLoggedInEvent evt) {
var playerInstance = evt.getPlayer(); var playerInstance = evt.getPlayer();
if (!(playerInstance instanceof ServerPlayer)) return; if (!(playerInstance instanceof ServerPlayer)) return;
ForgePlayer player = new ForgePlayer(playerInstance.getUUID(), this, getPlugin().getBlueMap()); ForgePlayer player = new ForgePlayer(playerInstance.getUUID(), this);
onlinePlayerMap.put(player.getUuid(), player); onlinePlayerMap.put(player.getUuid(), player);
onlinePlayerList.add(player); onlinePlayerList.add(player);
} }

11
implementations/forge-1.18.1/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java
View File

@ -25,10 +25,9 @@
package de.bluecolored.bluemap.forge; package de.bluecolored.bluemap.forge;
import com.flowpowered.math.vector.Vector3d; import com.flowpowered.math.vector.Vector3d;
import de.bluecolored.bluemap.common.BlueMapService; import de.bluecolored.bluemap.common.plugin.text.Text;
import de.bluecolored.bluemap.common.serverinterface.Gamemode; import de.bluecolored.bluemap.common.serverinterface.Gamemode;
import de.bluecolored.bluemap.common.serverinterface.Player; import de.bluecolored.bluemap.common.serverinterface.Player;
import de.bluecolored.bluemap.common.plugin.text.Text;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
@ -66,12 +65,10 @@ public class ForgePlayer implements Player {
private Gamemode gamemode; private Gamemode gamemode;
private final ForgeMod mod; private final ForgeMod mod;
private final BlueMapService blueMap;
public ForgePlayer(UUID playerUuid, ForgeMod mod, BlueMapService blueMap) { public ForgePlayer(UUID playerUuid, ForgeMod mod) {
this.uuid = playerUuid; this.uuid = playerUuid;
this.mod = mod; this.mod = mod;
this.blueMap = blueMap;
update(); update();
} }
@ -166,8 +163,8 @@ public void update() {
try { try {
var world = mod.getWorld(player.getLevel()); var world = mod.getWorld(player.getLevel());
this.world = blueMap.getWorldId(world.getSaveFolder()); this.world = mod.getPlugin().getBlueMap().getWorldId(world.getSaveFolder());
} catch (IOException e) { } catch (IOException | NullPointerException e) { // NullPointerException -> the plugin isn't fully loaded
this.world = "unknown"; this.world = "unknown";
} }
} }

2
implementations/forge-1.19.1/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java
View File

@ -209,7 +209,7 @@ public void onPlayerJoin(PlayerLoggedInEvent evt) {
var playerInstance = evt.getEntity(); var playerInstance = evt.getEntity();
if (!(playerInstance instanceof ServerPlayer)) return; if (!(playerInstance instanceof ServerPlayer)) return;
ForgePlayer player = new ForgePlayer(playerInstance.getUUID(), this, getPlugin().getBlueMap()); ForgePlayer player = new ForgePlayer(playerInstance.getUUID(), this);
onlinePlayerMap.put(player.getUuid(), player); onlinePlayerMap.put(player.getUuid(), player);
onlinePlayerList.add(player); onlinePlayerList.add(player);
} }

11
implementations/forge-1.19.1/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java
View File

@ -25,10 +25,9 @@
package de.bluecolored.bluemap.forge; package de.bluecolored.bluemap.forge;
import com.flowpowered.math.vector.Vector3d; import com.flowpowered.math.vector.Vector3d;
import de.bluecolored.bluemap.common.BlueMapService; import de.bluecolored.bluemap.common.plugin.text.Text;
import de.bluecolored.bluemap.common.serverinterface.Gamemode; import de.bluecolored.bluemap.common.serverinterface.Gamemode;
import de.bluecolored.bluemap.common.serverinterface.Player; import de.bluecolored.bluemap.common.serverinterface.Player;
import de.bluecolored.bluemap.common.plugin.text.Text;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
@ -66,12 +65,10 @@ public class ForgePlayer implements Player {
private Gamemode gamemode; private Gamemode gamemode;
private final ForgeMod mod; private final ForgeMod mod;
private final BlueMapService blueMap;
public ForgePlayer(UUID playerUuid, ForgeMod mod, BlueMapService blueMap) { public ForgePlayer(UUID playerUuid, ForgeMod mod) {
this.uuid = playerUuid; this.uuid = playerUuid;
this.mod = mod; this.mod = mod;
this.blueMap = blueMap;
update(); update();
} }
@ -166,8 +163,8 @@ public void update() {
try { try {
var world = mod.getWorld(player.getLevel()); var world = mod.getWorld(player.getLevel());
this.world = blueMap.getWorldId(world.getSaveFolder()); this.world = mod.getPlugin().getBlueMap().getWorldId(world.getSaveFolder());
} catch (IOException e) { } catch (IOException | NullPointerException e) { // NullPointerException -> the plugin isn't fully loaded
this.world = "unknown"; this.world = "unknown";
} }
} }

2
implementations/forge-1.19/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java
View File

@ -209,7 +209,7 @@ public void onPlayerJoin(PlayerLoggedInEvent evt) {
var playerInstance = evt.getPlayer(); var playerInstance = evt.getPlayer();
if (!(playerInstance instanceof ServerPlayer)) return; if (!(playerInstance instanceof ServerPlayer)) return;
ForgePlayer player = new ForgePlayer(playerInstance.getUUID(), this, getPlugin().getBlueMap()); ForgePlayer player = new ForgePlayer(playerInstance.getUUID(), this);
onlinePlayerMap.put(player.getUuid(), player); onlinePlayerMap.put(player.getUuid(), player);
onlinePlayerList.add(player); onlinePlayerList.add(player);
} }

11
implementations/forge-1.19/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java
View File

@ -25,10 +25,9 @@
package de.bluecolored.bluemap.forge; package de.bluecolored.bluemap.forge;
import com.flowpowered.math.vector.Vector3d; import com.flowpowered.math.vector.Vector3d;
import de.bluecolored.bluemap.common.BlueMapService; import de.bluecolored.bluemap.common.plugin.text.Text;
import de.bluecolored.bluemap.common.serverinterface.Gamemode; import de.bluecolored.bluemap.common.serverinterface.Gamemode;
import de.bluecolored.bluemap.common.serverinterface.Player; import de.bluecolored.bluemap.common.serverinterface.Player;
import de.bluecolored.bluemap.common.plugin.text.Text;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
@ -66,12 +65,10 @@ public class ForgePlayer implements Player {
private Gamemode gamemode; private Gamemode gamemode;
private final ForgeMod mod; private final ForgeMod mod;
private final BlueMapService blueMap;
public ForgePlayer(UUID playerUuid, ForgeMod mod, BlueMapService blueMap) { public ForgePlayer(UUID playerUuid, ForgeMod mod) {
this.uuid = playerUuid; this.uuid = playerUuid;
this.mod = mod; this.mod = mod;
this.blueMap = blueMap;
update(); update();
} }
@ -166,8 +163,8 @@ public void update() {
try { try {
var world = mod.getWorld(player.getLevel()); var world = mod.getWorld(player.getLevel());
this.world = blueMap.getWorldId(world.getSaveFolder()); this.world = mod.getPlugin().getBlueMap().getWorldId(world.getSaveFolder());
} catch (IOException e) { } catch (IOException | NullPointerException e) { // NullPointerException -> the plugin isn't fully loaded
this.world = "unknown"; this.world = "unknown";
} }
} }

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

@ -163,7 +163,7 @@ public void update() {
try { try {
var world = BukkitPlugin.getInstance().getWorld(player.getWorld()); var world = BukkitPlugin.getInstance().getWorld(player.getWorld());
this.world = BukkitPlugin.getInstance().getPlugin().getBlueMap().getWorldId(world.getSaveFolder()); this.world = BukkitPlugin.getInstance().getPlugin().getBlueMap().getWorldId(world.getSaveFolder());
} catch (IOException e) { } catch (IOException | NullPointerException e) { // NullPointerException -> the plugin isn't fully loaded
this.world = "unknown"; this.world = "unknown";
} }
} }

2
implementations/sponge-8.0.0/src/main/java/de/bluecolored/bluemap/sponge/SpongePlayer.java
View File

@ -166,7 +166,7 @@ public void update() {
try { try {
var world = SpongePlugin.getInstance().getWorld(player.world()); var world = SpongePlugin.getInstance().getWorld(player.world());
this.world = SpongePlugin.getInstance().getPlugin().getBlueMap().getWorldId(world.getSaveFolder()); this.world = SpongePlugin.getInstance().getPlugin().getBlueMap().getWorldId(world.getSaveFolder());
} catch (IOException e) { } catch (IOException | NullPointerException e) { // NullPointerException -> the plugin isn't fully loaded
this.world = "unknown"; this.world = "unknown";
} }
} }

2
implementations/sponge-9.0.0/src/main/java/de/bluecolored/bluemap/sponge/SpongePlayer.java
View File

@ -165,7 +165,7 @@ public void update() {
try { try {
var world = SpongePlugin.getInstance().getWorld(player.world()); var world = SpongePlugin.getInstance().getWorld(player.world());
this.world = SpongePlugin.getInstance().getPlugin().getBlueMap().getWorldId(world.getSaveFolder()); this.world = SpongePlugin.getInstance().getPlugin().getBlueMap().getWorldId(world.getSaveFolder());
} catch (IOException e) { } catch (IOException | NullPointerException e) { // NullPointerException -> the plugin isn't fully loaded
this.world = "unknown"; this.world = "unknown";
} }
} }