lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only keep CustomDonatorEnd variable.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-07-19 13:46:14 +00:00
parent d52c356b99
commit 596dd975ae
4 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDonator.java
View File

@@ -61,7 +61,6 @@ public class AdminDonator implements IAdminCommandHandler
{ {
targetPlayer.setDonator(true); targetPlayer.setDonator(true);
targetPlayer.updateNameTitleColor(); targetPlayer.updateNameTitleColor();
targetPlayer.getVariables().set("CustomDonator", true);
targetPlayer.getVariables().set("CustomDonatorEnd", System.currentTimeMillis() + donatorTime); targetPlayer.getVariables().set("CustomDonatorEnd", System.currentTimeMillis() + donatorTime);
targetPlayer.sendMessage(activeChar.getName() + " has granted you donator status!"); targetPlayer.sendMessage(activeChar.getName() + " has granted you donator status!");
activeChar.sendMessage("You have granted donator status to " + targetPlayer.getName()); activeChar.sendMessage("You have granted donator status to " + targetPlayer.getName());
@@ -73,7 +72,6 @@ public class AdminDonator implements IAdminCommandHandler
{ {
targetPlayer.setDonator(false); targetPlayer.setDonator(false);
targetPlayer.updateNameTitleColor(); targetPlayer.updateNameTitleColor();
targetPlayer.getVariables().set("CustomDonator", false);
targetPlayer.getVariables().remove("CustomDonatorEnd"); targetPlayer.getVariables().remove("CustomDonatorEnd");
targetPlayer.sendMessage(activeChar.getName() + " has revoked donator status from you!"); targetPlayer.sendMessage(activeChar.getName() + " has revoked donator status from you!");
activeChar.sendMessage("You have revoked donator status from " + targetPlayer.getName()); activeChar.sendMessage("You have revoked donator status from " + targetPlayer.getName());

14
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -14531,8 +14531,14 @@ public class PlayerInstance extends Playable
public void restoreCustomStatus() public void restoreCustomStatus()
{ {
final long currentTime = System.currentTimeMillis();
if (getVariables().getLong("CustomDonatorEnd", 0) > currentTime)
{
setDonator(true);
}
final long heroEnd = getVariables().getLong("CustomHeroEnd", 0); final long heroEnd = getVariables().getLong("CustomHeroEnd", 0);
if (getVariables().getBoolean("CustomHero", false) && ((heroEnd == 0) || (heroEnd > System.currentTimeMillis()))) if (getVariables().getBoolean("CustomHero", false) && ((heroEnd == 0) || (heroEnd > currentTime)))
{ {
setHero(true); setHero(true);
} }
@@ -14546,12 +14552,6 @@ public class PlayerInstance extends Playable
{ {
setNoble(true); setNoble(true);
} }
final long donatorEnd = getVariables().getLong("CustomDonatorEnd", 0);
if (getVariables().getBoolean("CustomDonator", false) && ((donatorEnd == 0) || (donatorEnd > System.currentTimeMillis())))
{
setDonator(true);
}
} }
/** /**

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDonator.java
View File

@@ -61,7 +61,6 @@ public class AdminDonator implements IAdminCommandHandler
{ {
targetPlayer.setDonator(true); targetPlayer.setDonator(true);
targetPlayer.updateNameTitleColor(); targetPlayer.updateNameTitleColor();
targetPlayer.getVariables().set("CustomDonator", true);
targetPlayer.getVariables().set("CustomDonatorEnd", System.currentTimeMillis() + donatorTime); targetPlayer.getVariables().set("CustomDonatorEnd", System.currentTimeMillis() + donatorTime);
targetPlayer.sendMessage(activeChar.getName() + " has granted you donator status!"); targetPlayer.sendMessage(activeChar.getName() + " has granted you donator status!");
activeChar.sendMessage("You have granted donator status to " + targetPlayer.getName()); activeChar.sendMessage("You have granted donator status to " + targetPlayer.getName());
@@ -73,7 +72,6 @@ public class AdminDonator implements IAdminCommandHandler
{ {
targetPlayer.setDonator(false); targetPlayer.setDonator(false);
targetPlayer.updateNameTitleColor(); targetPlayer.updateNameTitleColor();
targetPlayer.getVariables().set("CustomDonator", false);
targetPlayer.getVariables().remove("CustomDonatorEnd"); targetPlayer.getVariables().remove("CustomDonatorEnd");
targetPlayer.sendMessage(activeChar.getName() + " has revoked donator status from you!"); targetPlayer.sendMessage(activeChar.getName() + " has revoked donator status from you!");
activeChar.sendMessage("You have revoked donator status from " + targetPlayer.getName()); activeChar.sendMessage("You have revoked donator status from " + targetPlayer.getName());

14
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -14886,8 +14886,14 @@ public class PlayerInstance extends Playable
public void restoreCustomStatus() public void restoreCustomStatus()
{ {
final long currentTime = System.currentTimeMillis();
if (getVariables().getLong("CustomDonatorEnd", 0) > currentTime)
{
setDonator(true);
}
final long heroEnd = getVariables().getLong("CustomHeroEnd", 0); final long heroEnd = getVariables().getLong("CustomHeroEnd", 0);
if (getVariables().getBoolean("CustomHero", false) && ((heroEnd == 0) || (heroEnd > System.currentTimeMillis()))) if (getVariables().getBoolean("CustomHero", false) && ((heroEnd == 0) || (heroEnd > currentTime)))
{ {
setHero(true); setHero(true);
} }
@@ -14901,12 +14907,6 @@ public class PlayerInstance extends Playable
{ {
setNoble(true); setNoble(true);
} }
final long donatorEnd = getVariables().getLong("CustomDonatorEnd", 0);
if (getVariables().getBoolean("CustomDonator", false) && ((donatorEnd == 0) || (donatorEnd > System.currentTimeMillis())))
{
setDonator(true);
}
} }
/** /**