Add PvP protection system and admin claims

Major new features for server administrators to create protected safe zones
and configure server-wide PvP behavior.

## PvP Protection
- Add PvPProtectionSystem that blocks player-vs-player damage in PvP-disabled zones
- Configurable server mode: pvpinclaims true (PvP server) or false (PvE server)
- Rate-limited "PvP is disabled here" message to avoid spam
- Map shows safe zones with green tint and "[Safe]" indicator

## Admin Claims
- New admin claim system for spawn, shops, and community areas
- Create with /easyclaims admin claim [name] (e.g., "Spawn")
- Admin claims use reserved UUID (all zeros) and bypass buffer zones
- PvP disabled by default in admin claims
- Shown in light blue color on the map
- Custom display names appear on map instead of owner name

## Admin Commands
- /easyclaims admin claim [name] - Create admin claim at current location
- /easyclaims admin pvp [on/off] - Toggle PvP in any claim
- /easyclaims admin set pvpinclaims true/false - Server PvP mode

## Admin Bypass
- Admins with easyclaims.admin permission now bypass:
  - Claim limits and buffer zones when claiming chunks
  - All protection systems (block break/place/damage/use/pickup)

## Config Changes
- claimsPerHour now supports decimal values (e.g., 0.25 = 1 claim every 4 hours)
- New pvpInPlayerClaims setting with migration from deprecated allowPlayerPvpToggle
- formatClaimRate() helper for user-friendly display

## Data Model Updates
- Claim class extended with pvpEnabled, adminClaim, and displayName fields
- ClaimStorage updated with getClaimAt() method and migration support
- Full backward compatibility with existing claim data

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: cryptobench

README.md

@@ -23,6 +23,8 @@ That's it! Your builds are now protected.
 - **Share With Friends** - Trust players with different permission levels
 - **Full Protection** - Blocks breaking, placing, and interactions from strangers
 - **Anti-Griefing Buffer** - 2-chunk buffer zone prevents others from claiming too close to you
+- **PvP Protection** - Configure PvP rules per-server or per-claim (safe zones)
+- **Admin Claims** - Server-owned protected areas for spawn, shops, etc.
 
 ---
 
@@ -75,15 +77,20 @@ All commands use `/easyclaims`.
 | `/easyclaims admin reload` | Reload config from file |
 | `/easyclaims admin unclaim` | Remove claim at your location (any owner) |
 | `/easyclaims admin unclaim <player>` | Remove ALL claims from a player |
+| `/easyclaims admin claim [name]` | Create an admin claim (e.g., "Spawn") |
+| `/easyclaims admin pvp [on/off]` | Toggle PvP in the current claim |
 
 **Settings you can change:**
 ```
-/easyclaims admin set starting 6      # Starting claim slots for new players
-/easyclaims admin set perhour 3       # Extra claims earned per hour
-/easyclaims admin set max 100         # Maximum claims any player can have
-/easyclaims admin set buffer 2        # Buffer zone in chunks (0 = disabled)
+/easyclaims admin set starting 6          # Starting claim slots for new players
+/easyclaims admin set perhour 0.25        # Claims earned per hour (0.25 = 1 every 4 hours)
+/easyclaims admin set max 100             # Maximum claims any player can have
+/easyclaims admin set buffer 2            # Buffer zone in chunks (0 = disabled)
+/easyclaims admin set pvpinclaims false   # PvP in player claims (true=PvP, false=PvE)
 ```
 
+**Admin Bypass:** Admins with `easyclaims.admin` permission bypass all protection checks and claim limits.
+
 ---
 
 ## Trust Levels Explained
@@ -111,6 +118,7 @@ When you trust someone, you can choose how much access they get:
 - Open your **world map (M)** to see claims highlighted in color
 - Your claims show in your unique color, others show in theirs
 - **Buffer zone**: Other players can't claim within 2 chunks of your claims (prevents griefing)
+- **Admin claims** (light blue) are server-protected areas like spawn
 
 ### Earning More Claims
 
@@ -125,6 +133,27 @@ The longer you play, the more land you can claim:
 
 Use `/easyclaims playtime` to check your progress!
 
+### PvP Protection
+
+Server owners can configure PvP behavior:
+
+- **PvP Servers** (`pvpinclaims true`) - Fighting is allowed everywhere including player claims
+- **PvE Servers** (`pvpinclaims false`) - Player claims become safe zones where PvP is disabled
+
+On the map, safe zones show with a green tint and `[Safe]` label.
+
+### Admin Claims
+
+Admin claims are special server-owned protected areas for spawn, shops, arenas, etc.
+
+- Created with `/easyclaims admin claim [name]` (e.g., `/easyclaims admin claim Spawn`)
+- PvP disabled by default (toggle with `/easyclaims admin pvp on/off`)
+- Shown in **light blue** on the map
+- Not counted against any player's claim limit
+- Bypass buffer zone restrictions
+
+Use admin claims to create protected community areas!
+
 ---
 
 ## Installation

src/main/java/com/easyclaims/EasyClaims.java

@@ -16,6 +16,7 @@
 import com.easyclaims.systems.BlockUseProtectionSystem;
 import com.easyclaims.systems.ClaimTitleSystem;
 import com.easyclaims.systems.ItemPickupProtectionSystem;
+import com.easyclaims.systems.PvPProtectionSystem;
 import com.hypixel.hytale.server.core.event.events.player.PlayerConnectEvent;
 import com.hypixel.hytale.server.core.event.events.player.PlayerDisconnectEvent;
 import com.hypixel.hytale.server.core.plugin.JavaPlugin;
@@ -73,7 +74,7 @@ public void setup() {
         playtimeStorage = new PlaytimeStorage(getDataDirectory());
 
         // Initialize static accessor for map system
-        EasyClaimsAccess.init(claimStorage);
+        EasyClaimsAccess.init(claimStorage, config);
 
         // Initialize managers
         claimManager = new ClaimManager(claimStorage, playtimeStorage, config, blockGroups);
@@ -114,6 +115,7 @@ public void setup() {
             getEntityStoreRegistry().registerSystem(new BlockPlaceProtectionSystem(claimManager, getLogger()));
             getEntityStoreRegistry().registerSystem(new BlockUseProtectionSystem(claimManager, getLogger()));
             getEntityStoreRegistry().registerSystem(new ItemPickupProtectionSystem(claimManager, getLogger()));
+            getEntityStoreRegistry().registerSystem(new PvPProtectionSystem(claimManager, getLogger()));
 
             // Register claim title system (shows banner when entering/leaving claims)
             claimTitleSystem = new ClaimTitleSystem(claimStorage);
@@ -136,8 +138,13 @@ private void onWorldAdd(AddWorldEvent event) {
         // Set our custom world map provider for persistent worlds
         try {
             if (!world.getWorldConfig().isDeleteOnRemove()) {
+                // Set custom world map provider for map tiles
                 world.getWorldConfig().setWorldMapProvider(new EasyClaimsWorldMapProvider());
                 getLogger().atWarning().log("[Map] Set EasyClaimsWorldMapProvider for world: %s", world.getName());
+
+                // Register the marker provider for POI markers (enables live updates)
+                world.getWorldMapManager().addMarkerProvider("easyclaims", mapOverlayProvider);
+                getLogger().atInfo().log("[Map] Registered ClaimMapOverlayProvider for world: %s", world.getName());
             }
         } catch (Exception e) {
             getLogger().atSevere().withCause(e).log("[Map] Failed to set map provider for world: %s", world.getName());

src/main/java/com/easyclaims/EasyClaimsAccess.java

@@ -1,5 +1,8 @@
 package com.easyclaims;
 
+import com.easyclaims.config.PluginConfig;
+import com.easyclaims.data.AdminClaims;
+import com.easyclaims.data.Claim;
 import com.easyclaims.data.ClaimStorage;
 import com.easyclaims.data.PlayerClaims;
 import com.easyclaims.data.TrustedPlayer;
@@ -16,13 +19,15 @@
  */
 public class EasyClaimsAccess {
     private static ClaimStorage claimStorage;
+    private static PluginConfig pluginConfig;
 
     /**
-     * Initializes the accessor with the claim storage instance.
+     * Initializes the accessor with the claim storage and config instances.
      * Called during plugin startup.
      */
-    public static void init(ClaimStorage storage) {
+    public static void init(ClaimStorage storage, PluginConfig config) {
         claimStorage = storage;
+        pluginConfig = config;
         System.out.println("[EasyClaimsAccess] Initialized with claimStorage: " + (storage != null ? "OK" : "NULL"));
     }
 
@@ -86,4 +91,52 @@ public static List<String> getTrustedPlayerNames(String worldName, int chunkX, i
 
         return names;
     }
+
+    /**
+     * Checks if PvP is disabled at a location (for map rendering).
+     * - Unclaimed: PvP enabled (returns false)
+     * - Admin claims: Use claim's pvpEnabled setting
+     * - Player claims: Use server config (pvpInPlayerClaims)
+     */
+    public static boolean isPvPDisabled(String worldName, int chunkX, int chunkZ) {
+        if (claimStorage == null) return false;
+        Claim claim = claimStorage.getClaimAt(worldName, chunkX, chunkZ);
+        if (claim == null) {
+            return false; // Unclaimed = PvP enabled
+        }
+
+        // Admin claims use their own per-claim setting
+        if (claim.isAdminClaim()) {
+            return !claim.isPvpEnabled();
+        }
+
+        // Player claims use the global server setting
+        if (pluginConfig == null) return false;
+        return !pluginConfig.isPvpInPlayerClaims();
+    }
+
+    /**
+     * Checks if a chunk is an admin claim.
+     */
+    public static boolean isAdminClaim(String worldName, int chunkX, int chunkZ) {
+        if (claimStorage == null) return false;
+        UUID owner = claimStorage.getClaimOwner(worldName, chunkX, chunkZ);
+        return AdminClaims.isAdminClaim(owner);
+    }
+
+    /**
+     * Gets the display name for a claim (for admin claims with custom names).
+     * Returns the custom display name if set, otherwise returns the owner name.
+     */
+    public static String getClaimDisplayName(String worldName, int chunkX, int chunkZ) {
+        if (claimStorage == null) return null;
+
+        Claim claim = claimStorage.getClaimAt(worldName, chunkX, chunkZ);
+        if (claim != null && claim.getDisplayName() != null && !claim.getDisplayName().isEmpty()) {
+            return claim.getDisplayName();
+        }
+
+        // Fall back to owner name
+        return getOwnerName(worldName, chunkX, chunkZ);
+    }
 }

src/main/java/com/easyclaims/commands/subcommands/ClaimSubcommand.java

@@ -6,6 +6,7 @@
 import com.hypixel.hytale.server.core.Message;
 import com.hypixel.hytale.server.core.command.system.CommandContext;
 import com.hypixel.hytale.server.core.command.system.basecommands.AbstractPlayerCommand;
+import com.hypixel.hytale.server.core.entity.entities.Player;
 import com.hypixel.hytale.server.core.modules.entity.component.TransformComponent;
 import com.hypixel.hytale.server.core.universe.PlayerRef;
 import com.hypixel.hytale.server.core.universe.world.World;
@@ -51,7 +52,11 @@ protected void execute(@Nonnull CommandContext ctx,
         int currentClaims = claimManager.getPlayerClaims(playerId).getClaimCount();
         int maxClaims = claimManager.getMaxClaims(playerId);
 
-        ClaimManager.ClaimResult result = claimManager.claimChunk(playerId, worldName, position.getX(), position.getZ());
+        // Check if player is admin - bypass claim limits and buffer zones
+        Player player = store.getComponent(playerRef, Player.getComponentType());
+        boolean isAdmin = player != null && player.hasPermission("easyclaims.admin");
+
+        ClaimManager.ClaimResult result = claimManager.claimChunk(playerId, worldName, position.getX(), position.getZ(), isAdmin);
 
         switch (result) {
             case SUCCESS:

src/main/java/com/easyclaims/commands/subcommands/SettingsSubcommand.java

@@ -2,9 +2,11 @@
 
 import com.hypixel.hytale.component.Ref;
 import com.hypixel.hytale.component.Store;
+import com.hypixel.hytale.math.vector.Vector3d;
 import com.hypixel.hytale.server.core.command.system.CommandContext;
 import com.hypixel.hytale.server.core.command.system.basecommands.AbstractPlayerCommand;
 import com.hypixel.hytale.server.core.entity.entities.Player;
+import com.hypixel.hytale.server.core.modules.entity.component.TransformComponent;
 import com.hypixel.hytale.server.core.universe.PlayerRef;
 import com.hypixel.hytale.server.core.universe.world.World;
 import com.hypixel.hytale.server.core.universe.world.storage.EntityStore;
@@ -17,7 +19,7 @@ public class SettingsSubcommand extends AbstractPlayerCommand {
     private final EasyClaims plugin;
 
     public SettingsSubcommand(EasyClaims plugin) {
-        super("settings", "Manage your trusted players");
+        super("settings", "Manage your claim settings and trusted players");
         this.plugin = plugin;
         requirePermission("easyclaims.use");
     }
@@ -31,13 +33,22 @@ protected void execute(@Nonnull CommandContext ctx,
         Player player = store.getComponent(playerRef, Player.getComponentType());
         if (player == null) return;
 
+        // Get player's current position for claim lookup
+        TransformComponent transform = store.getComponent(playerRef, TransformComponent.getComponentType());
+        Vector3d position = transform != null ? transform.getPosition() : new Vector3d(0, 0, 0);
+        String worldName = world.getName();
+
         world.execute(() -> {
             player.getPageManager().openCustomPage(playerRef, store,
                     new ClaimSettingsGui(
                             playerData,
                             plugin.getClaimManager(),
                             plugin.getPlaytimeManager(),
-                            (playerId) -> plugin.refreshPlayerClaimChunks(playerId)
+                            (playerId) -> plugin.refreshPlayerClaimChunks(playerId),
+                            plugin,
+                            worldName,
+                            position.getX(),
+                            position.getZ()
                     )
             );
         });

src/main/java/com/easyclaims/commands/subcommands/admin/AdminClaimSubcommand.java

@@ -0,0 +1,80 @@
+package com.easyclaims.commands.subcommands.admin;
+
+import com.hypixel.hytale.component.Ref;
+import com.hypixel.hytale.component.Store;
+import com.hypixel.hytale.math.vector.Vector3d;
+import com.hypixel.hytale.server.core.command.system.CommandContext;
+import com.hypixel.hytale.server.core.command.system.arguments.system.OptionalArg;
+import com.hypixel.hytale.server.core.command.system.arguments.types.ArgTypes;
+import com.hypixel.hytale.server.core.command.system.basecommands.AbstractPlayerCommand;
+import com.hypixel.hytale.server.core.modules.entity.component.TransformComponent;
+import com.hypixel.hytale.server.core.universe.PlayerRef;
+import com.hypixel.hytale.server.core.universe.world.World;
+import com.hypixel.hytale.server.core.universe.world.storage.EntityStore;
+import com.hypixel.hytale.math.util.ChunkUtil;
+import com.easyclaims.EasyClaims;
+import com.easyclaims.data.AdminClaims;
+import com.easyclaims.data.Claim;
+import com.easyclaims.util.Messages;
+
+import javax.annotation.Nonnull;
+import java.util.UUID;
+
+/**
+ * Admin command to create server-owned admin claims.
+ * Admin claims have PvP disabled by default and bypass buffer zones.
+ */
+public class AdminClaimSubcommand extends AbstractPlayerCommand {
+    private final EasyClaims plugin;
+    private final OptionalArg<String> displayNameArg;
+
+    public AdminClaimSubcommand(EasyClaims plugin) {
+        super("claim", "Create an admin claim at your location");
+        this.plugin = plugin;
+        this.displayNameArg = withOptionalArg("name", "Display name for the claim (e.g., Spawn)", ArgTypes.STRING);
+        requirePermission("easyclaims.admin");
+    }
+
+    @Override
+    protected void execute(@Nonnull CommandContext ctx,
+                          @Nonnull Store<EntityStore> store,
+                          @Nonnull Ref<EntityStore> playerRef,
+                          @Nonnull PlayerRef playerData,
+                          @Nonnull World world) {
+        TransformComponent transform = store.getComponent(playerRef, TransformComponent.getComponentType());
+        Vector3d position = transform.getPosition();
+        String worldName = world.getName();
+
+        int chunkX = ChunkUtil.chunkCoordinate((int) position.getX());
+        int chunkZ = ChunkUtil.chunkCoordinate((int) position.getZ());
+
+        // Check if already claimed
+        UUID existingOwner = plugin.getClaimStorage().getClaimOwner(worldName, chunkX, chunkZ);
+        if (existingOwner != null) {
+            String ownerName = plugin.getClaimStorage().getPlayerName(existingOwner);
+            if (AdminClaims.isAdminClaim(existingOwner)) {
+                playerData.sendMessage(Messages.alreadyOwnChunk());
+            } else {
+                playerData.sendMessage(Messages.chunkClaimedByOther(ownerName));
+            }
+            return;
+        }
+
+        // Get optional display name
+        String displayName = displayNameArg.get(ctx);
+
+        // Register admin name for map display
+        plugin.getClaimStorage().setPlayerName(AdminClaims.ADMIN_UUID,
+                displayName != null ? displayName : AdminClaims.DEFAULT_DISPLAY_NAME);
+
+        // Create admin claim (PvP disabled by default)
+        Claim claim = Claim.createAdminClaim(worldName, chunkX, chunkZ, displayName);
+        plugin.getClaimStorage().addClaim(AdminClaims.ADMIN_UUID, claim);
+
+        // Refresh map
+        plugin.refreshWorldMapChunk(worldName, chunkX, chunkZ);
+
+        playerData.sendMessage(Messages.adminClaimCreated(chunkX, chunkZ, displayName));
+        playerData.sendMessage(Messages.pvpStatusDisabled());
+    }
+}

src/main/java/com/easyclaims/commands/subcommands/admin/AdminConfigSubcommand.java

@@ -10,6 +10,7 @@
 import com.hypixel.hytale.server.core.universe.world.storage.EntityStore;
 import com.easyclaims.EasyClaims;
 import com.easyclaims.config.PluginConfig;
+import com.easyclaims.util.Messages;
 
 import javax.annotation.Nonnull;
 import java.awt.Color;
@@ -38,7 +39,7 @@ protected void execute(@Nonnull CommandContext ctx,
         playerData.sendMessage(Message.raw("=== Server Claim Settings ===").color(GOLD));
         playerData.sendMessage(Message.raw("").color(GRAY));
         playerData.sendMessage(Message.raw("New players start with: " + config.getStartingClaims() + " claims").color(AQUA));
-        playerData.sendMessage(Message.raw("Players earn: " + config.getClaimsPerHour() + " extra claims per hour played").color(AQUA));
+        playerData.sendMessage(Message.raw("Players earn: " + Messages.formatClaimRate(config.getClaimsPerHour())).color(AQUA));
         playerData.sendMessage(Message.raw("Maximum claims allowed: " + config.getMaxClaims()).color(AQUA));
         int buffer = config.getClaimBufferSize();
         String bufferText = buffer > 0 ? buffer + " chunks" : "disabled";