Upstream
/
dynmap
mirror of https://github.com/webbukkit/dynmap.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

implemented hideifspectator switch, still need to test fabric/forge

This commit is contained in:
Jurgen 2023-09-27 22:22:00 +02:00
parent c093a95bc0
commit 030a0e1d24
23 changed files with 178 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
DynmapCore/src/main/java/org/dynmap/ClientUpdateComponent.java
View File

@ -12,6 +12,7 @@ public class ClientUpdateComponent extends Component {
private int hideifshadow;
private int hideifunder;
private boolean hideifsneaking;
private boolean hideifspectator;
private boolean hideifinvisiblepotion;
private boolean is_protected;
public static boolean usePlayerColors;
@ -24,6 +25,7 @@ public class ClientUpdateComponent extends Component {
hideifshadow = configuration.getInteger("hideifshadow", 15);
hideifunder = configuration.getInteger("hideifundercover", 15);
hideifsneaking = configuration.getBoolean("hideifsneaking", false);
hideifspectator = configuration.getBoolean("hideifspectator", false);
hideifinvisiblepotion = configuration.getBoolean("hide-if-invisiblity-potion", true);
is_protected = configuration.getBoolean("protected-player-info", false);
usePlayerColors = configuration.getBoolean("use-name-colors", false);
@ -100,6 +102,9 @@ public class ClientUpdateComponent extends Component {
if((!hide) && hideifsneaking && p.isSneaking()) {
hide = true;
}
if((!hide) && hideifspectator && p.isSpectator()) {
hide = true;
}
if((!hide) && is_protected && (!see_all)) {
if(e.user != null) {
hide = !core.testIfPlayerVisibleToPlayer(e.user, p.getName());

6
DynmapCore/src/main/java/org/dynmap/common/DynmapPlayer.java
View File

@ -44,6 +44,12 @@ public interface DynmapPlayer extends DynmapCommandSender {
* @return true if sneaking
*/
public boolean isSneaking();
/**
* get spectator gamemode
* @return true if gamemode spectator
*/
public boolean isSpectator();
/**
* Get health
* @return health points

12
fabric-1.14.4/src/main/java/org/dynmap/fabric_1_14_4/FabricPlayer.java
View File

@ -192,13 +192,17 @@ public class FabricPlayer extends FabricCommandSender implements DynmapPlayer {
@Override
public boolean isInvisible() {
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
return player.isInvisible();
}
return false;
}
@Override
public boolean isSpectator() {
if(player != null) {
return player.isSpectator();
}
return false;
}
@Override
public int getSortWeight() {
return plugin.getSortWeight(getName());

12
fabric-1.15.2/src/main/java/org/dynmap/fabric_1_15_2/FabricPlayer.java
View File

@ -192,13 +192,17 @@ public class FabricPlayer extends FabricCommandSender implements DynmapPlayer {
@Override
public boolean isInvisible() {
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
return player.isInvisible();
}
return false;
}
@Override
public boolean isSpectator() {
if(player != null) {
return player.isSpectator();
}
return false;
}
@Override
public int getSortWeight() {
return plugin.getSortWeight(getName());

12
fabric-1.16.4/src/main/java/org/dynmap/fabric_1_16_4/FabricPlayer.java
View File

@ -192,13 +192,17 @@ public class FabricPlayer extends FabricCommandSender implements DynmapPlayer {
@Override
public boolean isInvisible() {
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
return player.isInvisible();
}
return false;
}
@Override
public boolean isSpectator() {
if(player != null) {
return player.isSpectator();
}
return false;
}
@Override
public int getSortWeight() {
return plugin.getSortWeight(getName());

12
fabric-1.17.1/src/main/java/org/dynmap/fabric_1_17_1/FabricPlayer.java
View File

@ -195,13 +195,17 @@ public class FabricPlayer extends FabricCommandSender implements DynmapPlayer {
@Override
public boolean isInvisible() {
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
return player.isInvisible();
}
return false;
}
@Override
public boolean isSpectator() {
if(player != null) {
return player.isSpectator();
}
return false;
}
@Override
public int getSortWeight() {
return plugin.getSortWeight(getName());

12
fabric-1.18.2/src/main/java/org/dynmap/fabric_1_18_2/FabricPlayer.java
View File

@ -195,13 +195,17 @@ public class FabricPlayer extends FabricCommandSender implements DynmapPlayer {
@Override
public boolean isInvisible() {
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
return player.isInvisible();
}
return false;
}
@Override
public boolean isSpectator() {
if(player != null) {
return player.isSpectator();
}
return false;
}
@Override
public int getSortWeight() {
return plugin.getSortWeight(getName());

12
fabric-1.19.1/src/main/java/org/dynmap/fabric_1_19_1/FabricPlayer.java
View File

@ -195,13 +195,17 @@ public class FabricPlayer extends FabricCommandSender implements DynmapPlayer {
@Override
public boolean isInvisible() {
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
return player.isInvisible();
}
return false;
}
@Override
public boolean isSpectator() {
if(player != null) {
return player.isSpectator();
}
return false;
}
@Override
public int getSortWeight() {
return plugin.getSortWeight(getName());

12
fabric-1.19.3/src/main/java/org/dynmap/fabric_1_19_3/FabricPlayer.java
View File

@ -195,13 +195,17 @@ public class FabricPlayer extends FabricCommandSender implements DynmapPlayer {
@Override
public boolean isInvisible() {
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
return player.isInvisible();
}
return false;
}
@Override
public boolean isSpectator() {
if(player != null) {
return player.isSpectator();
}
return false;
}
@Override
public int getSortWeight() {
return plugin.getSortWeight(getName());

12
fabric-1.19.4/src/main/java/org/dynmap/fabric_1_19_4/FabricPlayer.java
View File

@ -195,13 +195,17 @@ public class FabricPlayer extends FabricCommandSender implements DynmapPlayer {
@Override
public boolean isInvisible() {
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
return player.isInvisible();
}
return false;
}
@Override
public boolean isSpectator() {
if(player != null) {
return player.isSpectator();
}
return false;
}
@Override
public int getSortWeight() {
return plugin.getSortWeight(getName());

12
fabric-1.19/src/main/java/org/dynmap/fabric_1_19/FabricPlayer.java
View File

@ -195,13 +195,17 @@ public class FabricPlayer extends FabricCommandSender implements DynmapPlayer {
@Override
public boolean isInvisible() {
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
return player.isInvisible();
}
return false;
}
@Override
public boolean isSpectator() {
if(player != null) {
return player.isSpectator();
}
return false;
}
@Override
public int getSortWeight() {
return plugin.getSortWeight(getName());

12
fabric-1.20/src/main/java/org/dynmap/fabric_1_20/FabricPlayer.java
View File

@ -197,13 +197,17 @@ public class FabricPlayer extends FabricCommandSender implements DynmapPlayer {
@Override
public boolean isInvisible() {
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
return player.isInvisible();
}
return false;
}
@Override
public boolean isSpectator() {
if(player != null) {
return player.isSpectator();
}
return false;
}
@Override
public int getSortWeight() {
return plugin.getSortWeight(getName());

10
forge-1.12.2/src/main/java/org/dynmap/forge_1_12_2/DynmapPlugin.java
View File

@ -1328,12 +1328,16 @@ public class DynmapPlugin
@Override
public boolean isInvisible() {
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
return player.isInvisible()
}
return false;
}
public boolean isSpectator() {
if(player != null) {return player.isSpectator()}
return false;
}
@Override
public int getSortWeight() {
Integer wt = sortWeights.get(getName());

11
forge-1.14.4/src/main/java/org/dynmap/forge_1_14_4/DynmapPlugin.java
View File

@ -1287,9 +1287,14 @@ public class DynmapPlugin
@Override
public boolean isInvisible() {
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
return player.isInvisible();
}
return false;
}
@Override
public boolean isSpectator() {
if(player != null) {
return player.isSpectator();
}
return false;
}

11
forge-1.15.2/src/main/java/org/dynmap/forge_1_15_2/DynmapPlugin.java
View File

@ -1296,9 +1296,14 @@ public class DynmapPlugin
@Override
public boolean isInvisible() {
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
return player.isInvisible();
}
return false;
}
@Override
public boolean isSpectator() {
if(player != null) {
return player.isSpectator();
}
return false;
}

11
forge-1.16.5/src/main/java/org/dynmap/forge_1_16_5/DynmapPlugin.java
View File

@ -1314,9 +1314,14 @@ public class DynmapPlugin
@Override
public boolean isInvisible() {
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
return player.isInvisible();
}
return false;
}
@Override
public boolean isSpectator() {
if(player != null) {
return player.isSpectator();
}
return false;
}

11
forge-1.17.1/src/main/java/org/dynmap/forge_1_17_1/DynmapPlugin.java
View File

@ -1294,9 +1294,14 @@ public class DynmapPlugin
@Override
public boolean isInvisible() {
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
return player.isInvisible();
}
return false;
}
@Override
public boolean isSpectator() {
if(player != null) {
return player.isSpectator();
}
return false;
}

11
forge-1.18.2/src/main/java/org/dynmap/forge_1_18_2/DynmapPlugin.java
View File

@ -1301,9 +1301,14 @@ public class DynmapPlugin
@Override
public boolean isInvisible() {
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
return player.isInvisible();
}
return false;
}
@Override
public boolean isSpectator() {
if(player != null) {
return player.isSpectator();
}
return false;
}

11
forge-1.19.2/src/main/java/org/dynmap/forge_1_19_2/DynmapPlugin.java
View File

@ -1301,9 +1301,14 @@ public class DynmapPlugin
@Override
public boolean isInvisible() {
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
return player.isInvisible();
}
return false;
}
@Override
public boolean isSpectator() {
if(player != null) {
return player.isSpectator();
}
return false;
}

11
forge-1.19.3/src/main/java/org/dynmap/forge_1_19_3/DynmapPlugin.java
View File

@ -1303,9 +1303,14 @@ public class DynmapPlugin
@Override
public boolean isInvisible() {
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
return player.isInvisible();
}
return false;
}
@Override
public boolean isSpectator() {
if(player != null) {
return player.isSpectator();
}
return false;
}

11
forge-1.19/src/main/java/org/dynmap/forge_1_19/DynmapPlugin.java
View File

@ -1301,9 +1301,14 @@ public class DynmapPlugin
@Override
public boolean isInvisible() {
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
return player.isInvisible();
}
return false;
}
@Override
public boolean isSpectator() {
if(player != null) {
return player.isSpectator();
}
return false;
}

11
forge-1.20/src/main/java/org/dynmap/forge_1_20/DynmapPlugin.java
View File

@ -1303,9 +1303,14 @@ public class DynmapPlugin
@Override
public boolean isInvisible() {
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
return player.isInvisible();
}
return false;
}
@Override
public boolean isSpectator() {
if(player != null) {
return player.isSpectator();
}
return false;
}

12
spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java
View File

@ -102,7 +102,6 @@ import org.dynmap.common.chunk.GenericMapChunkCache;
import org.dynmap.hdmap.HDMap;
import org.dynmap.markers.MarkerAPI;
import org.dynmap.modsupport.ModSupportImpl;
import org.dynmap.renderer.DynmapBlockState;
import org.dynmap.utils.MapChunkCache;
import org.dynmap.utils.Polygon;
import org.dynmap.utils.VisibilityLimit;
@ -756,13 +755,18 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
@Override
public boolean isInvisible() {
if(player != null) {
if (player.getGameMode() == GameMode.SPECTATOR)
return true;
else return player.hasPotionEffect(PotionEffectType.INVISIBILITY);
return player.hasPotionEffect(PotionEffectType.INVISIBILITY);
}
return false;
}
@Override
public boolean isSpectator() {
if(player != null) {
return player.getGameMode() == GameMode.SPECTATOR;
}
return false;
}
@Override
public int getSortWeight() {
Integer wt = sortWeights.get(getName());
if (wt != null)