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

Fixed some null SystemMessageId parameters.

Browse Source 
Thanks to kinghanker.
This commit is contained in:
MobiusDevelopment 2022-04-23 10:00:28 +00:00
parent 99555d6bf6
commit f33a219ee6
8 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -396,7 +396,9 @@ public class EnterWorld implements IClientIncomingPacket
final ClanHall clanHall = ClanHallTable.getInstance().getClanHallByOwner(player.getClan());
if ((clanHall != null) && !clanHall.getPaid())
{
player.sendPacket(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW);
final SystemMessage sm = new SystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW);
sm.addNumber(clanHall.getLease());
player.sendPacket(sm);
}
}

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -421,7 +421,9 @@ public class EnterWorld implements IClientIncomingPacket
final ClanHall clanHall = ClanHallTable.getInstance().getClanHallByOwner(player.getClan());
if ((clanHall != null) && !clanHall.getPaid())
{
player.sendPacket(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW);
final SystemMessage sm = new SystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW);
sm.addNumber(clanHall.getLease());
player.sendPacket(sm);
}
}

6
L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java vendored
View File

@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.sevensigns.SevenSigns;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class MercTicket implements IItemHandler
{
@ -74,6 +75,7 @@ public class MercTicket implements IItemHandler
player.sendPacket(SystemMessageId.THIS_MERCENARY_CANNOT_BE_POSITIONED_ANYMORE);
return false;
}
// Checking the Seal of Strife status
switch (SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE))
{
@ -121,7 +123,9 @@ public class MercTicket implements IItemHandler
MercTicketManager.getInstance().addTicket(item.getId(), player);
player.destroyItem("Consume", item.getObjectId(), 1, null, false); // Remove item from char's inventory
player.sendPacket(SystemMessageId.PLACE_S1_IN_THE_CURRENT_LOCATION_AND_DIRECTION_DO_YOU_WISH_TO_CONTINUE);
final SystemMessage sm = new SystemMessage(SystemMessageId.PLACE_S1_IN_THE_CURRENT_LOCATION_AND_DIRECTION_DO_YOU_WISH_TO_CONTINUE);
sm.addItemName(item.getId());
player.sendPacket(sm);
return true;
}
}

12
L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -237,15 +237,11 @@ public class EnterWorld implements IClientIncomingPacket
notifySponsorOrApprentice(player);
final AuctionableHall clanHall = ClanHallTable.getInstance().getClanHallByOwner(clan);
if (clanHall != null)
if ((clanHall != null) && !clanHall.getPaid())
{
if (!clanHall.getPaid())
{
// final SystemMessage sm = new SystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW);
// sm.addString(String.format("%1$TH:%1$TM", LocalTime.ofSecondOfDay((System.currentTimeMillis() - clanHall.getPaidUntil()) / 1000)));
// player.sendPacket(sm);
player.sendPacket(new SystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW));
}
final SystemMessage sm = new SystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW);
sm.addInt(clanHall.getLease());
player.sendPacket(sm);
}
for (Siege siege : SiegeManager.getInstance().getSieges())

6
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java vendored
View File

@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.sevensigns.SevenSigns;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class MercTicket implements IItemHandler
{
@ -74,6 +75,7 @@ public class MercTicket implements IItemHandler
player.sendPacket(SystemMessageId.THIS_MERCENARY_CANNOT_BE_POSITIONED_ANYMORE);
return false;
}
// Checking the Seal of Strife status
switch (SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE))
{
@ -121,7 +123,9 @@ public class MercTicket implements IItemHandler
MercTicketManager.getInstance().addTicket(item.getId(), player);
player.destroyItem("Consume", item.getObjectId(), 1, null, false); // Remove item from char's inventory
player.sendPacket(SystemMessageId.PLACE_S1_IN_THE_CURRENT_LOCATION_AND_DIRECTION_DO_YOU_WISH_TO_CONTINUE);
final SystemMessage sm = new SystemMessage(SystemMessageId.PLACE_S1_IN_THE_CURRENT_LOCATION_AND_DIRECTION_DO_YOU_WISH_TO_CONTINUE);
sm.addItemName(item.getId());
player.sendPacket(sm);
return true;
}
}

9
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -250,12 +250,11 @@ public class EnterWorld implements IClientIncomingPacket
notifySponsorOrApprentice(player);
final AuctionableHall clanHall = ClanHallTable.getInstance().getClanHallByOwner(clan);
if (clanHall != null)
if ((clanHall != null) && !clanHall.getPaid())
{
if (!clanHall.getPaid())
{
player.sendPacket(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW);
}
final SystemMessage sm = new SystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW);
sm.addInt(clanHall.getLease());
player.sendPacket(sm);
}
for (Siege siege : SiegeManager.getInstance().getSieges())

6
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java vendored
View File

@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.sevensigns.SevenSigns;
import org.l2jmobius.gameserver.model.siege.Castle;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class MercTicket implements IItemHandler
{
@ -74,6 +75,7 @@ public class MercTicket implements IItemHandler
player.sendPacket(SystemMessageId.THIS_MERCENARY_CANNOT_BE_POSITIONED_ANYMORE);
return false;
}
// Checking the Seal of Strife status
switch (SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE))
{
@ -121,7 +123,9 @@ public class MercTicket implements IItemHandler
MercTicketManager.getInstance().addTicket(item.getId(), player);
player.destroyItem("Consume", item.getObjectId(), 1, null, false); // Remove item from char's inventory
player.sendPacket(SystemMessageId.PLACE_S1_IN_THE_CURRENT_LOCATION_AND_DIRECTION_DO_YOU_WISH_TO_CONTINUE);
final SystemMessage sm = new SystemMessage(SystemMessageId.PLACE_S1_IN_THE_CURRENT_LOCATION_AND_DIRECTION_DO_YOU_WISH_TO_CONTINUE);
sm.addItemName(item.getId());
player.sendPacket(sm);
return true;
}
}

9
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@ -251,12 +251,11 @@ public class EnterWorld implements IClientIncomingPacket
notifySponsorOrApprentice(player);
final AuctionableHall clanHall = ClanHallTable.getInstance().getClanHallByOwner(clan);
if (clanHall != null)
if ((clanHall != null) && !clanHall.getPaid())
{
if (!clanHall.getPaid())
{
player.sendPacket(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW);
}
final SystemMessage sm = new SystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW);
sm.addInt(clanHall.getLease());
player.sendPacket(sm);
}
for (Siege siege : SiegeManager.getInstance().getSieges())