Merge pull request webbukkit#4015 from JurgenKuyper/v3.0

implemented hide if spectator

DynmapCore/src/main/java/org/dynmap/ClientUpdateComponent.java

@@ -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 ClientUpdateComponent(final DynmapCore core, ConfigurationNode configurat
         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 @@ else if(pw.isNether() == false) {   /* Not nether */
             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());

DynmapCore/src/main/java/org/dynmap/common/DynmapPlayer.java

@@ -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

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

@@ -191,12 +191,18 @@ public void sendMessage(String msg) {
 
     @Override
     public boolean isInvisible() {
-        if (player != null) {
+        if(player != null) {
             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());

fabric-1.14.4/src/main/resources/configuration.txt

@@ -80,6 +80,8 @@ components:
   #  hideifundercover: 14
   #  # (Optional) if true, players that are crouching/sneaking will be hidden 
     hideifsneaking: false
+    # optional, if true, players that are in spectator mode will be hidden
+    hideifspectator: false
     # If true, player positions/status is protected (login with ID with dynmap.playermarkers.seeall permission required for info other than self)
     protected-player-info: false
     # If true, hide players with invisibility potion effects active

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

@@ -191,12 +191,18 @@ public void sendMessage(String msg) {
 
     @Override
     public boolean isInvisible() {
-        if (player != null) {
+        if(player != null) {
             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());

fabric-1.15.2/src/main/resources/configuration.txt

@@ -80,6 +80,8 @@ components:
   #  hideifundercover: 14
   #  # (Optional) if true, players that are crouching/sneaking will be hidden 
     hideifsneaking: false
+    # optional, if true, players that are in spectator mode will be hidden
+    hideifspectator: false
     # If true, player positions/status is protected (login with ID with dynmap.playermarkers.seeall permission required for info other than self)
     protected-player-info: false
     # If true, hide players with invisibility potion effects active

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

@@ -191,12 +191,18 @@ public void sendMessage(String msg) {
 
     @Override
     public boolean isInvisible() {
-        if (player != null) {
+        if(player != null) {
             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());

fabric-1.16.4/src/main/resources/configuration.txt

@@ -80,6 +80,8 @@ components:
   #  hideifundercover: 14
   #  # (Optional) if true, players that are crouching/sneaking will be hidden 
     hideifsneaking: false
+    # optional, if true, players that are in spectator mode will be hidden
+    hideifspectator: false
     # If true, player positions/status is protected (login with ID with dynmap.playermarkers.seeall permission required for info other than self)
     protected-player-info: false
     # If true, hide players with invisibility potion effects active

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

@@ -194,12 +194,18 @@ public void sendMessage(String msg) {
 
     @Override
     public boolean isInvisible() {
-        if (player != null) {
+        if(player != null) {
             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());

fabric-1.17.1/src/main/resources/configuration.txt

@@ -80,6 +80,8 @@ components:
   #  hideifundercover: 14
   #  # (Optional) if true, players that are crouching/sneaking will be hidden 
     hideifsneaking: false
+    # optional, if true, players that are in spectator mode will be hidden
+    hideifspectator: false
     # If true, player positions/status is protected (login with ID with dynmap.playermarkers.seeall permission required for info other than self)
     protected-player-info: false
     # If true, hide players with invisibility potion effects active

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

@@ -194,12 +194,18 @@ public void sendMessage(String msg) {
 
     @Override
     public boolean isInvisible() {
-        if (player != null) {
+        if(player != null) {
             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());

fabric-1.18.2/src/main/resources/configuration.txt

@@ -80,6 +80,8 @@ components:
   #  hideifundercover: 14
   #  # (Optional) if true, players that are crouching/sneaking will be hidden 
     hideifsneaking: false
+    # optional, if true, players that are in spectator mode will be hidden
+    hideifspectator: false
     # If true, player positions/status is protected (login with ID with dynmap.playermarkers.seeall permission required for info other than self)
     protected-player-info: false
     # If true, hide players with invisibility potion effects active

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

@@ -194,12 +194,18 @@ public void sendMessage(String msg) {
 
     @Override
     public boolean isInvisible() {
-        if (player != null) {
+        if(player != null) {
             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());

fabric-1.19.1/src/main/resources/configuration.txt

@@ -80,6 +80,8 @@ components:
   #  hideifundercover: 14
   #  # (Optional) if true, players that are crouching/sneaking will be hidden 
     hideifsneaking: false
+    # optional, if true, players that are in spectator mode will be hidden
+    hideifspectator: false
     # If true, player positions/status is protected (login with ID with dynmap.playermarkers.seeall permission required for info other than self)
     protected-player-info: false
     # If true, hide players with invisibility potion effects active

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

@@ -194,12 +194,18 @@ public void sendMessage(String msg) {
 
     @Override
     public boolean isInvisible() {
-        if (player != null) {
+        if(player != null) {
             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());

fabric-1.19.3/src/main/resources/configuration.txt

@@ -80,6 +80,8 @@ components:
   #  hideifundercover: 14
   #  # (Optional) if true, players that are crouching/sneaking will be hidden 
     hideifsneaking: false
+    # optional, if true, players that are in spectator mode will be hidden
+    hideifspectator: false
     # If true, player positions/status is protected (login with ID with dynmap.playermarkers.seeall permission required for info other than self)
     protected-player-info: false
     # If true, hide players with invisibility potion effects active

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

@@ -194,12 +194,18 @@ public void sendMessage(String msg) {
 
     @Override
     public boolean isInvisible() {
-        if (player != null) {
+        if(player != null) {
             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());

fabric-1.19.4/src/main/resources/configuration.txt

@@ -80,6 +80,8 @@ components:
   #  hideifundercover: 14
   #  # (Optional) if true, players that are crouching/sneaking will be hidden 
     hideifsneaking: false
+    # optional, if true, players that are in spectator mode will be hidden
+    hideifspectator: false
     # If true, player positions/status is protected (login with ID with dynmap.playermarkers.seeall permission required for info other than self)
     protected-player-info: false
     # If true, hide players with invisibility potion effects active

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

@@ -194,12 +194,18 @@ public void sendMessage(String msg) {
 
     @Override
     public boolean isInvisible() {
-        if (player != null) {
+        if(player != null) {
             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());

fabric-1.19/src/main/resources/configuration.txt

@@ -80,6 +80,8 @@ components:
   #  hideifundercover: 14
   #  # (Optional) if true, players that are crouching/sneaking will be hidden 
     hideifsneaking: false
+    # optional, if true, players that are in spectator mode will be hidden
+    hideifspectator: false
     # If true, player positions/status is protected (login with ID with dynmap.playermarkers.seeall permission required for info other than self)
     protected-player-info: false
     # If true, hide players with invisibility potion effects active

fabric-1.20.2/src/main/java/org/dynmap/fabric_1_20_2/FabricPlayer.java

@@ -201,6 +201,13 @@ public boolean isInvisible() {
         }
         return false;
     }
+    @Override
+    public boolean isSpectator() {
+        if(player != null) {
+            return player.isSpectator();
+        }
+        return false;
+    }
 
     @Override
     public int getSortWeight() {

fabric-1.20.2/src/main/resources/configuration.txt

@@ -80,6 +80,8 @@ components:
   #  hideifundercover: 14
   #  # (Optional) if true, players that are crouching/sneaking will be hidden 
     hideifsneaking: false
+    # optional, if true, players that are in spectator mode will be hidden
+    hideifspectator: false
     # If true, player positions/status is protected (login with ID with dynmap.playermarkers.seeall permission required for info other than self)
     protected-player-info: false
     # If true, hide players with invisibility potion effects active

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

@@ -196,12 +196,18 @@ public void sendMessage(String msg) {
 
     @Override
     public boolean isInvisible() {
-        if (player != null) {
+        if(player != null) {
             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());

fabric-1.20/src/main/resources/configuration.txt

@@ -80,6 +80,8 @@ components:
   #  hideifundercover: 14
   #  # (Optional) if true, players that are crouching/sneaking will be hidden 
     hideifsneaking: false
+    # optional, if true, players that are in spectator mode will be hidden
+    hideifspectator: false
     # If true, player positions/status is protected (login with ID with dynmap.playermarkers.seeall permission required for info other than self)
     protected-player-info: false
     # If true, hide players with invisibility potion effects active

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

@@ -1327,10 +1327,17 @@ public void sendMessage(String msg)
         }
         @Override
         public boolean isInvisible() {
-        	if(player != null) {
-        		return player.isInvisible();
-        	}
-        	return false;
+            if(player != null) {
+                return player.isInvisible()
+            }
+            return false;
+        }
+        @override
+        public boolean isSpectator() {
+            if(player != null) {
+                return player.isSpectator()
+            }
+            return false;
         }
         @Override
         public int getSortWeight() {

forge-1.12.2/src/main/resources/configuration.txt

@@ -68,6 +68,8 @@ components:
   #  hideifundercover: 14
   #  # (Optional) if true, players that are crouching/sneaking will be hidden 
     hideifsneaking: false
+    # optional, if true, players that are in spectator mode will be hidden
+    hideifspectator: false
     # If true, player positions/status is protected (login with ID with dynmap.playermarkers.seeall permission required for info other than self)
     protected-player-info: false
     # If true, hide players with invisibility potion effects active