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

implemented hide if spectator

This commit is contained in:
Jurgen 2023-09-03 12:37:58 +02:00
parent 7ed6728e34
commit c093a95bc0
21 changed files with 104 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -191,8 +191,10 @@ public class FabricPlayer extends FabricCommandSender implements DynmapPlayer {
@Override
public boolean isInvisible() {
if (player != null) {
return player.isInvisible();
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
}
return false;
}

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

@ -191,8 +191,10 @@ public class FabricPlayer extends FabricCommandSender implements DynmapPlayer {
@Override
public boolean isInvisible() {
if (player != null) {
return player.isInvisible();
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
}
return false;
}

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

@ -191,8 +191,10 @@ public class FabricPlayer extends FabricCommandSender implements DynmapPlayer {
@Override
public boolean isInvisible() {
if (player != null) {
return player.isInvisible();
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
}
return false;
}

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

@ -194,8 +194,10 @@ public class FabricPlayer extends FabricCommandSender implements DynmapPlayer {
@Override
public boolean isInvisible() {
if (player != null) {
return player.isInvisible();
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
}
return false;
}

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

@ -194,8 +194,10 @@ public class FabricPlayer extends FabricCommandSender implements DynmapPlayer {
@Override
public boolean isInvisible() {
if (player != null) {
return player.isInvisible();
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
}
return false;
}

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

@ -194,8 +194,10 @@ public class FabricPlayer extends FabricCommandSender implements DynmapPlayer {
@Override
public boolean isInvisible() {
if (player != null) {
return player.isInvisible();
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
}
return false;
}

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

@ -194,8 +194,10 @@ public class FabricPlayer extends FabricCommandSender implements DynmapPlayer {
@Override
public boolean isInvisible() {
if (player != null) {
return player.isInvisible();
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
}
return false;
}

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

@ -194,8 +194,10 @@ public class FabricPlayer extends FabricCommandSender implements DynmapPlayer {
@Override
public boolean isInvisible() {
if (player != null) {
return player.isInvisible();
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
}
return false;
}

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

@ -194,8 +194,10 @@ public class FabricPlayer extends FabricCommandSender implements DynmapPlayer {
@Override
public boolean isInvisible() {
if (player != null) {
return player.isInvisible();
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
}
return false;
}

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

@ -196,8 +196,10 @@ public class FabricPlayer extends FabricCommandSender implements DynmapPlayer {
@Override
public boolean isInvisible() {
if (player != null) {
return player.isInvisible();
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
}
return false;
}

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

@ -1327,10 +1327,12 @@ public class DynmapPlugin
}
@Override
public boolean isInvisible() {
if(player != null) {
return player.isInvisible();
}
return false;
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
}
return false;
}
@Override
public int getSortWeight() {

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

@ -1286,10 +1286,12 @@ public class DynmapPlugin
}
@Override
public boolean isInvisible() {
if(player != null) {
return player.isInvisible();
}
return false;
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
}
return false;
}
@Override
public int getSortWeight() {

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

@ -1295,10 +1295,12 @@ public class DynmapPlugin
}
@Override
public boolean isInvisible() {
if(player != null) {
return player.isInvisible();
}
return false;
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
}
return false;
}
@Override
public int getSortWeight() {

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

@ -1313,10 +1313,12 @@ public class DynmapPlugin
}
@Override
public boolean isInvisible() {
if(player != null) {
return player.isInvisible();
}
return false;
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
}
return false;
}
@Override
public int getSortWeight() {

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

@ -1293,10 +1293,12 @@ public class DynmapPlugin
}
@Override
public boolean isInvisible() {
if(player != null) {
return player.isInvisible();
}
return false;
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
}
return false;
}
@Override
public int getSortWeight() {

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

@ -1300,10 +1300,12 @@ public class DynmapPlugin
}
@Override
public boolean isInvisible() {
if(player != null) {
return player.isInvisible();
}
return false;
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
}
return false;
}
@Override
public int getSortWeight() {

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

@ -1300,10 +1300,12 @@ public class DynmapPlugin
}
@Override
public boolean isInvisible() {
if(player != null) {
return player.isInvisible();
}
return false;
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
}
return false;
}
@Override
public int getSortWeight() {

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

@ -1302,10 +1302,12 @@ public class DynmapPlugin
}
@Override
public boolean isInvisible() {
if(player != null) {
return player.isInvisible();
}
return false;
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
}
return false;
}
@Override
public int getSortWeight() {

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

@ -1300,10 +1300,12 @@ public class DynmapPlugin
}
@Override
public boolean isInvisible() {
if(player != null) {
return player.isInvisible();
}
return false;
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
}
return false;
}
@Override
public int getSortWeight() {

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

@ -1302,10 +1302,12 @@ public class DynmapPlugin
}
@Override
public boolean isInvisible() {
if(player != null) {
return player.isInvisible();
}
return false;
if(player != null) {
if (player.isSpectator())
return true;
else return player.isInvisible();
}
return false;
}
@Override
public int getSortWeight() {

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

@ -22,14 +22,7 @@ import org.bstats.bukkit.Metrics;
import org.bstats.charts.CustomChart;
import org.bstats.json.JsonObjectBuilder;
import org.bstats.json.JsonObjectBuilder.JsonObject;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Chunk;
import org.bukkit.ChunkSnapshot;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.OfflinePlayer;
import org.bukkit.World;
import org.bukkit.*;
import org.bukkit.attribute.Attribute;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
@ -763,7 +756,9 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
@Override
public boolean isInvisible() {
if(player != null) {
return player.hasPotionEffect(PotionEffectType.INVISIBILITY);
if (player.getGameMode() == GameMode.SPECTATOR)
return true;
else return player.hasPotionEffect(PotionEffectType.INVISIBILITY);
}
return false;
}