Addition of CustomDonatorEnd player variable.

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDonator.java

@@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
 import org.l2jmobius.gameserver.util.BuilderUtil;
+import org.l2jmobius.gameserver.util.Util;
 
 public class AdminDonator implements IAdminCommandHandler
 {
@@ -48,8 +49,7 @@ public class AdminDonator implements IAdminCommandHandler
 			if (target instanceof PlayerInstance)
 			{
 				final PlayerInstance targetPlayer = (PlayerInstance) target;
-				final boolean newDonator = !targetPlayer.isDonator();
+				if (!targetPlayer.isDonator())
-				if (newDonator)
 				{
 					targetPlayer.setDonator(true);
 					targetPlayer.updateNameTitleColor();
@@ -59,6 +59,14 @@ public class AdminDonator implements IAdminCommandHandler
 					AdminData.broadcastMessageToGMs("Warn: " + activeChar.getName() + " has set " + targetPlayer.getName() + " as donator !");
 					targetPlayer.broadcastPacket(new SocialAction(targetPlayer.getObjectId(), 16));
 					targetPlayer.broadcastUserInfo();
+					
+					// Optional duration in days parameter.
+					final String value = command.replace("admin_setdonator ", "");
+					if (Util.isDigit(value))
+					{
+						final long donatorTime = Long.valueOf(value) * 24 * 60 * 60 * 1000;
+						targetPlayer.getVariables().set("CustomDonatorEnd", donatorTime == 0 ? 0 : System.currentTimeMillis() + donatorTime);
+					}
 				}
 				else
 				{
@@ -69,6 +77,9 @@ public class AdminDonator implements IAdminCommandHandler
 					activeChar.sendMessage("You have revoked donator status from " + targetPlayer.getName());
 					AdminData.broadcastMessageToGMs("Warn: " + activeChar.getName() + " has removed donator status from player" + targetPlayer.getName());
 					targetPlayer.broadcastUserInfo();
+					
+					// Optional duration in days parameter.
+					targetPlayer.getVariables().remove("CustomDonatorEnd");
 				}
 			}
 			else

L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -14547,7 +14547,8 @@ public class PlayerInstance extends Playable
 			setNoble(true);
 		}
 		
-		if (getVariables().getBoolean("CustomDonator", false))
+		final long donatorEnd = getVariables().getLong("CustomDonatorEnd", 0);
+		if (getVariables().getBoolean("CustomDonator", false) && ((donatorEnd == 0) || (donatorEnd > System.currentTimeMillis())))
 		{
 			setDonator(true);
 		}

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDonator.java

@@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
 import org.l2jmobius.gameserver.util.BuilderUtil;
+import org.l2jmobius.gameserver.util.Util;
 
 public class AdminDonator implements IAdminCommandHandler
 {
@@ -48,8 +49,7 @@ public class AdminDonator implements IAdminCommandHandler
 			if (target instanceof PlayerInstance)
 			{
 				final PlayerInstance targetPlayer = (PlayerInstance) target;
-				final boolean newDonator = !targetPlayer.isDonator();
+				if (!targetPlayer.isDonator())
-				if (newDonator)
 				{
 					targetPlayer.setDonator(true);
 					targetPlayer.updateNameTitleColor();
@@ -59,6 +59,14 @@ public class AdminDonator implements IAdminCommandHandler
 					AdminData.broadcastMessageToGMs("Warn: " + activeChar.getName() + " has set " + targetPlayer.getName() + " as donator !");
 					targetPlayer.broadcastPacket(new SocialAction(targetPlayer.getObjectId(), 16));
 					targetPlayer.broadcastUserInfo();
+					
+					// Optional duration in days parameter.
+					final String value = command.replace("admin_setdonator ", "");
+					if (Util.isDigit(value))
+					{
+						final long donatorTime = Long.valueOf(value) * 24 * 60 * 60 * 1000;
+						targetPlayer.getVariables().set("CustomDonatorEnd", donatorTime == 0 ? 0 : System.currentTimeMillis() + donatorTime);
+					}
 				}
 				else
 				{
@@ -69,6 +77,9 @@ public class AdminDonator implements IAdminCommandHandler
 					activeChar.sendMessage("You have revoked donator status from " + targetPlayer.getName());
 					AdminData.broadcastMessageToGMs("Warn: " + activeChar.getName() + " has removed donator status from player" + targetPlayer.getName());
 					targetPlayer.broadcastUserInfo();
+					
+					// Optional duration in days parameter.
+					targetPlayer.getVariables().remove("CustomDonatorEnd");
 				}
 			}
 			else

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -14902,7 +14902,8 @@ public class PlayerInstance extends Playable
 			setNoble(true);
 		}
 		
-		if (getVariables().getBoolean("CustomDonator", false))
+		final long donatorEnd = getVariables().getLong("CustomDonatorEnd", 0);
+		if (getVariables().getBoolean("CustomDonator", false) && ((donatorEnd == 0) || (donatorEnd > System.currentTimeMillis())))
 		{
 			setDonator(true);
 		}