[Citizens Compatibility] Use remaining combat tag time for NPC survival time

[TheosisOfficial]

Server Implementation

Paper

Server Version

other

CombatLogX Version

[15:34:26 INFO]: Java Version: 17.0.2
[15:34:26 INFO]: Java Vendor: Oracle Corporation
[15:34:26 INFO]: Java URL: N/A
[15:34:26 INFO]: Server Version: git-Paper-450 (MC: 1.20.4)
[15:34:26 INFO]: Bukkit Version: 1.20.4-R0.1-SNAPSHOT
[15:34:26 INFO]: Minecraft Version: 1.20.4
[15:34:26 INFO]: NMS Version: 1_20_R3
[15:34:26 INFO]: Dependency Information:
[15:34:26 INFO]: - AngelChest (not installed)
[15:34:26 INFO]: - ASkyBlock (not installed)
[15:34:26 INFO]: - BentoBox (not installed)
[15:34:26 INFO]: - Citizens v2.0.33-SNAPSHOT (build 3372)
[15:34:26 INFO]: - CMI (not installed)
[15:34:26 INFO]: - CrackShot (not installed)
[15:34:26 INFO]: - CrashClaim (not installed)
[15:34:26 INFO]: - Essentials (not installed)
[15:34:26 INFO]: - FabledSkyBlock (not installed)
[15:34:26 INFO]: - FeatherBoard (not installed)
[15:34:26 INFO]: - FlagWar (not installed)
[15:34:26 INFO]: - GriefDefender (not installed)
[15:34:26 INFO]: - GriefPrevention v16.18.2
[15:34:26 INFO]: - HuskHomes (not installed)
[15:34:26 INFO]: - HuskSync (not installed)
[15:34:26 INFO]: - HuskTowns (not installed)
[15:34:26 INFO]: - iDisguise (not installed)
[15:34:26 INFO]: - IridiumSkyblock (not installed)
[15:34:26 INFO]: - Kingdoms (not installed)
[15:34:26 INFO]: - Konquest (not installed)
[15:34:26 INFO]: - Lands (not installed)
[15:34:26 INFO]: - LibsDisguises (not installed)
[15:34:26 INFO]: - MarriageMaster (not installed)
[15:34:26 INFO]: - MCPets (not installed)
[15:34:26 INFO]: - MythicMobs (not installed)
[15:34:26 INFO]: - PlaceholderAPI v2.11.5
[15:34:26 INFO]: - PlayerParticles (not installed)
[15:34:26 INFO]: - PreciousStones (not installed)
[15:34:26 INFO]: - PremiumVanish v2.9.9
[15:34:26 INFO]: - ProtectionStones (not installed)
[15:34:26 INFO]: - ProtocolLib v5.2.0-SNAPSHOT-679
[15:34:26 INFO]: - RedProtect (not installed)
[15:34:26 INFO]: - Residence (not installed)
[15:34:26 INFO]: - Sentinel (not installed)
[15:34:26 INFO]: - SuperiorSkyblock2 (not installed)
[15:34:26 INFO]: - SuperVanish (not installed)
[15:34:26 INFO]: - Towny (not installed)
[15:34:26 INFO]: - UltimateClaims (not installed)
[15:34:26 INFO]: - uSkyBlock (not installed)
[15:34:26 INFO]: - VanishNoPacket (not installed)
[15:34:26 INFO]: - WorldGuard v7.0.9+5934e49
[15:34:26 INFO]: - ViaVersion (not installed)
[15:34:26 INFO]: - BlueSlimeCore v2.9.5.Beta-407
[15:34:26 INFO]: CombatLogX by SirBlobman
[15:34:26 INFO]: Local Version: 11.4.0.2.Beta-1227
[15:34:26 INFO]: Remote Version: 11.4.0.1.1193
[15:34:26 INFO]: Enabled Expansions (2):
[15:34:26 INFO]: - Citizens Compatibility v17.14
[15:34:26 INFO]: - Mob Tagger v17.1

Feature Request

The time of the NPC's survival should be how ever much time was left on the player's combat tag timer before they logged out, rather than a static value.

Also the tag-player option being set to true should only tag the player upon logging in, if the player's NPC had not yet despawned. If the NPC had already despawned, there is no reason to tag the player again upon logging in.