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

Null warnings should never be suppressed.

Browse Source
This commit is contained in:
MobiusDevelopment 2022-08-26 00:13:15 +00:00
parent 03a61c2c3a
commit 635271c89a
6 changed files with 230 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSiege.java
View File

@ -62,7 +62,6 @@ public class AdminSiege implements IAdminCommandHandler
"admin_clanhallteleportself"
};
@SuppressWarnings("null")
@Override
public boolean useAdminCommand(String commandValue, Player activeChar)
{
@ -105,7 +104,7 @@ public class AdminSiege implements IAdminCommandHandler
if (command.equalsIgnoreCase("admin_add_attacker"))
{
if (player == null)
if ((player == null) || (castle == null))
{
activeChar.sendPacket(SystemMessageId.THAT_IS_THE_INCORRECT_TARGET);
}
@ -120,7 +119,7 @@ public class AdminSiege implements IAdminCommandHandler
}
else if (command.equalsIgnoreCase("admin_add_defender"))
{
if (player == null)
if ((player == null) || (castle == null))
{
activeChar.sendPacket(SystemMessageId.THAT_IS_THE_INCORRECT_TARGET);
}
@ -131,28 +130,39 @@ public class AdminSiege implements IAdminCommandHandler
}
else if (command.equalsIgnoreCase("admin_add_guard"))
{
try
if (castle != null)
{
final int npcId = Integer.parseInt(val);
castle.getSiege().getSiegeGuardManager().addSiegeGuard(activeChar, npcId);
}
catch (Exception e)
{
BuilderUtil.sendSysMessage(activeChar, "Usage: //add_guard npcId");
try
{
final int npcId = Integer.parseInt(val);
castle.getSiege().getSiegeGuardManager().addSiegeGuard(activeChar, npcId);
}
catch (Exception e)
{
BuilderUtil.sendSysMessage(activeChar, "Usage: //add_guard npcId");
}
}
}
else if (command.equalsIgnoreCase("admin_clear_siege_list"))
{
castle.getSiege().clearSiegeClan();
if (castle != null)
{
castle.getSiege().clearSiegeClan();
}
}
else if (command.equalsIgnoreCase("admin_endsiege"))
{
castle.getSiege().endSiege();
if (castle != null)
{
castle.getSiege().endSiege();
}
}
else if (command.equalsIgnoreCase("admin_list_siege_clans"))
{
castle.getSiege().listRegisterClan(activeChar);
if (castle != null)
{
castle.getSiege().listRegisterClan(activeChar);
}
return true;
}
else if (command.equalsIgnoreCase("admin_move_defenders"))
@ -165,26 +175,29 @@ public class AdminSiege implements IAdminCommandHandler
{
activeChar.sendPacket(SystemMessageId.THAT_IS_THE_INCORRECT_TARGET);
}
else
else if (castle != null)
{
castle.setOwner(player.getClan());
}
}
else if (command.equalsIgnoreCase("admin_removecastle"))
{
final Clan clan = ClanTable.getInstance().getClan(castle.getOwnerId());
if (clan != null)
if (castle != null)
{
castle.removeOwner(clan);
}
else
{
BuilderUtil.sendSysMessage(activeChar, "Unable to remove castle");
final Clan clan = ClanTable.getInstance().getClan(castle.getOwnerId());
if (clan != null)
{
castle.removeOwner(clan);
}
else
{
BuilderUtil.sendSysMessage(activeChar, "Unable to remove castle");
}
}
}
else if (command.equalsIgnoreCase("admin_clanhallset"))
{
if ((player == null) || (player.getClan() == null))
if ((player == null) || (player.getClan() == null) || (clanhall == null))
{
activeChar.sendPacket(SystemMessageId.THAT_IS_THE_INCORRECT_TARGET);
}
@ -207,7 +220,7 @@ public class AdminSiege implements IAdminCommandHandler
}
else if (command.equalsIgnoreCase("admin_clanhalldel"))
{
if (!ClanHallTable.getInstance().isFree(clanhall.getId()))
if ((clanhall != null) && !ClanHallTable.getInstance().isFree(clanhall.getId()))
{
ClanHallTable.getInstance().setFree(clanhall.getId());
AuctionManager.getInstance().initNPC(clanhall.getId());
@ -219,34 +232,49 @@ public class AdminSiege implements IAdminCommandHandler
}
else if (command.equalsIgnoreCase("admin_clanhallopendoors"))
{
clanhall.openCloseDoors(true);
if (clanhall != null)
{
clanhall.openCloseDoors(true);
}
}
else if (command.equalsIgnoreCase("admin_clanhallclosedoors"))
{
clanhall.openCloseDoors(false);
if (clanhall != null)
{
clanhall.openCloseDoors(false);
}
}
else if (command.equalsIgnoreCase("admin_clanhallteleportself"))
{
final ClanHallZone zone = clanhall.getZone();
if (zone != null)
if (clanhall != null)
{
activeChar.teleToLocation(zone.getSpawnLoc(), true);
final ClanHallZone zone = clanhall.getZone();
if (zone != null)
{
activeChar.teleToLocation(zone.getSpawnLoc(), true);
}
}
}
else if (command.equalsIgnoreCase("admin_spawn_doors"))
{
castle.spawnDoor();
if (castle != null)
{
castle.spawnDoor();
}
}
else if (command.equalsIgnoreCase("admin_startsiege"))
{
castle.getSiege().startSiege();
if (castle != null)
{
castle.getSiege().startSiege();
}
}
if (clanhall != null)
{
showClanHallPage(activeChar, clanhall);
}
else
else if (castle != null)
{
showSiegePage(activeChar, castle.getName());
}

7
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/OfflineShop.java
View File

@ -38,10 +38,10 @@ public class OfflineShop implements IVoicedCommandHandler
{
private static final String[] VOICED_COMMANDS =
{
"offline",
"offline_shop"
};
@SuppressWarnings("null")
@Override
public boolean useVoicedCommand(String command, Player player, String target)
{
@ -66,7 +66,7 @@ public class OfflineShop implements IVoicedCommandHandler
}
final TradeList storeListBuy = player.getBuyList();
if ((storeListBuy == null) && (storeListBuy.getItemCount() == 0))
if ((storeListBuy == null) || (storeListBuy.getItemCount() == 0))
{
player.sendMessage("Your buy list is empty.");
player.sendPacket(ActionFailed.STATIC_PACKET);
@ -74,7 +74,7 @@ public class OfflineShop implements IVoicedCommandHandler
}
final TradeList storeListSell = player.getSellList();
if ((storeListSell == null) && (storeListSell.getItemCount() == 0))
if ((storeListSell == null) || (storeListSell.getItemCount() == 0))
{
player.sendMessage("Your sell list is empty.");
player.sendPacket(ActionFailed.STATIC_PACKET);
@ -143,7 +143,6 @@ public class OfflineShop implements IVoicedCommandHandler
player.sendMessage("Your private store has succesfully been flagged as an offline shop and will remain active for ever.");
player.logout();
return true;
}

107
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/hitConditionBonus.java
View File

@ -85,78 +85,75 @@ public class hitConditionBonus
factory.setIgnoringElementContentWhitespace(true);
factory.setIgnoringComments(true);
final File file = new File(Config.DATAPACK_ROOT, "data/stats/hitConditionBonus.xml");
Document doc = null;
if (file.exists())
{
try
{
doc = factory.newDocumentBuilder().parse(file);
}
catch (Exception e)
{
LOGGER.warning("[hitConditionBonus] Could not parse file: " + e.getMessage());
}
String name;
for (@SuppressWarnings("null")
Node list = doc.getFirstChild(); list != null; list = list.getNextSibling())
{
if ("hitConditionBonus".equalsIgnoreCase(list.getNodeName()) || "list".equalsIgnoreCase(list.getNodeName()))
String name;
final Document doc = factory.newDocumentBuilder().parse(file);
for (Node list = doc.getFirstChild(); list != null; list = list.getNextSibling())
{
for (Node cond = list.getFirstChild(); cond != null; cond = cond.getNextSibling())
if ("hitConditionBonus".equalsIgnoreCase(list.getNodeName()) || "list".equalsIgnoreCase(list.getNodeName()))
{
int bonus = 0;
name = cond.getNodeName();
try
for (Node cond = list.getFirstChild(); cond != null; cond = cond.getNextSibling())
{
if (cond.hasAttributes())
int bonus = 0;
name = cond.getNodeName();
try
{
bonus = Integer.parseInt(cond.getAttributes().getNamedItem("val").getNodeValue());
if (cond.hasAttributes())
{
bonus = Integer.parseInt(cond.getAttributes().getNamedItem("val").getNodeValue());
}
}
}
catch (Exception e)
{
LOGGER.warning("[hitConditionBonus] Could not parse condition: " + e.getMessage());
}
finally
{
switch (name)
catch (Exception e)
{
case "front":
LOGGER.warning("[hitConditionBonus] Could not parse condition: " + e.getMessage());
}
finally
{
switch (name)
{
frontBonus = bonus;
break;
}
case "side":
{
sideBonus = bonus;
break;
}
case "back":
{
backBonus = bonus;
break;
}
case "high":
{
highBonus = bonus;
break;
}
case "low":
{
lowBonus = bonus;
break;
}
case "dark":
{
darkBonus = bonus;
break;
case "front":
{
frontBonus = bonus;
break;
}
case "side":
{
sideBonus = bonus;
break;
}
case "back":
{
backBonus = bonus;
break;
}
case "high":
{
highBonus = bonus;
break;
}
case "low":
{
lowBonus = bonus;
break;
}
case "dark":
{
darkBonus = bonus;
break;
}
}
}
}
}
}
}
catch (Exception e)
{
LOGGER.warning("[hitConditionBonus] Could not parse file: " + e.getMessage());
}
}
else
{

92
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSiege.java
View File

@ -62,7 +62,6 @@ public class AdminSiege implements IAdminCommandHandler
"admin_clanhallteleportself"
};
@SuppressWarnings("null")
@Override
public boolean useAdminCommand(String commandValue, Player activeChar)
{
@ -105,7 +104,7 @@ public class AdminSiege implements IAdminCommandHandler
if (command.equalsIgnoreCase("admin_add_attacker"))
{
if (player == null)
if ((player == null) || (castle == null))
{
activeChar.sendPacket(SystemMessageId.THAT_IS_THE_INCORRECT_TARGET);
}
@ -120,7 +119,7 @@ public class AdminSiege implements IAdminCommandHandler
}
else if (command.equalsIgnoreCase("admin_add_defender"))
{
if (player == null)
if ((player == null) || (castle == null))
{
activeChar.sendPacket(SystemMessageId.THAT_IS_THE_INCORRECT_TARGET);
}
@ -131,28 +130,39 @@ public class AdminSiege implements IAdminCommandHandler
}
else if (command.equalsIgnoreCase("admin_add_guard"))
{
try
if (castle != null)
{
final int npcId = Integer.parseInt(val);
castle.getSiege().getSiegeGuardManager().addSiegeGuard(activeChar, npcId);
}
catch (Exception e)
{
BuilderUtil.sendSysMessage(activeChar, "Usage: //add_guard npcId");
try
{
final int npcId = Integer.parseInt(val);
castle.getSiege().getSiegeGuardManager().addSiegeGuard(activeChar, npcId);
}
catch (Exception e)
{
BuilderUtil.sendSysMessage(activeChar, "Usage: //add_guard npcId");
}
}
}
else if (command.equalsIgnoreCase("admin_clear_siege_list"))
{
castle.getSiege().clearSiegeClan();
if (castle != null)
{
castle.getSiege().clearSiegeClan();
}
}
else if (command.equalsIgnoreCase("admin_endsiege"))
{
castle.getSiege().endSiege();
if (castle != null)
{
castle.getSiege().endSiege();
}
}
else if (command.equalsIgnoreCase("admin_list_siege_clans"))
{
castle.getSiege().listRegisterClan(activeChar);
if (castle != null)
{
castle.getSiege().listRegisterClan(activeChar);
}
return true;
}
else if (command.equalsIgnoreCase("admin_move_defenders"))
@ -165,26 +175,29 @@ public class AdminSiege implements IAdminCommandHandler
{
activeChar.sendPacket(SystemMessageId.THAT_IS_THE_INCORRECT_TARGET);
}
else
else if (castle != null)
{
castle.setOwner(player.getClan());
}
}
else if (command.equalsIgnoreCase("admin_removecastle"))
{
final Clan clan = ClanTable.getInstance().getClan(castle.getOwnerId());
if (clan != null)
if (castle != null)
{
castle.removeOwner(clan);
}
else
{
BuilderUtil.sendSysMessage(activeChar, "Unable to remove castle");
final Clan clan = ClanTable.getInstance().getClan(castle.getOwnerId());
if (clan != null)
{
castle.removeOwner(clan);
}
else
{
BuilderUtil.sendSysMessage(activeChar, "Unable to remove castle");
}
}
}
else if (command.equalsIgnoreCase("admin_clanhallset"))
{
if ((player == null) || (player.getClan() == null))
if ((player == null) || (player.getClan() == null) || (clanhall == null))
{
activeChar.sendPacket(SystemMessageId.THAT_IS_THE_INCORRECT_TARGET);
}
@ -207,7 +220,7 @@ public class AdminSiege implements IAdminCommandHandler
}
else if (command.equalsIgnoreCase("admin_clanhalldel"))
{
if (!ClanHallTable.getInstance().isFree(clanhall.getId()))
if ((clanhall != null) && !ClanHallTable.getInstance().isFree(clanhall.getId()))
{
ClanHallTable.getInstance().setFree(clanhall.getId());
AuctionManager.getInstance().initNPC(clanhall.getId());
@ -219,34 +232,49 @@ public class AdminSiege implements IAdminCommandHandler
}
else if (command.equalsIgnoreCase("admin_clanhallopendoors"))
{
clanhall.openCloseDoors(true);
if (clanhall != null)
{
clanhall.openCloseDoors(true);
}
}
else if (command.equalsIgnoreCase("admin_clanhallclosedoors"))
{
clanhall.openCloseDoors(false);
if (clanhall != null)
{
clanhall.openCloseDoors(false);
}
}
else if (command.equalsIgnoreCase("admin_clanhallteleportself"))
{
final ClanHallZone zone = clanhall.getZone();
if (zone != null)
if (clanhall != null)
{
activeChar.teleToLocation(zone.getSpawnLoc(), true);
final ClanHallZone zone = clanhall.getZone();
if (zone != null)
{
activeChar.teleToLocation(zone.getSpawnLoc(), true);
}
}
}
else if (command.equalsIgnoreCase("admin_spawn_doors"))
{
castle.spawnDoor();
if (castle != null)
{
castle.spawnDoor();
}
}
else if (command.equalsIgnoreCase("admin_startsiege"))
{
castle.getSiege().startSiege();
if (castle != null)
{
castle.getSiege().startSiege();
}
}
if (clanhall != null)
{
showClanHallPage(activeChar, clanhall);
}
else
else if (castle != null)
{
showSiegePage(activeChar, castle.getName());
}

7
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/OfflineShop.java
View File

@ -38,10 +38,10 @@ public class OfflineShop implements IVoicedCommandHandler
{
private static final String[] VOICED_COMMANDS =
{
"offline",
"offline_shop"
};
@SuppressWarnings("null")
@Override
public boolean useVoicedCommand(String command, Player player, String target)
{
@ -66,7 +66,7 @@ public class OfflineShop implements IVoicedCommandHandler
}
final TradeList storeListBuy = player.getBuyList();
if ((storeListBuy == null) && (storeListBuy.getItemCount() == 0))
if ((storeListBuy == null) || (storeListBuy.getItemCount() == 0))
{
player.sendMessage("Your buy list is empty.");
player.sendPacket(ActionFailed.STATIC_PACKET);
@ -74,7 +74,7 @@ public class OfflineShop implements IVoicedCommandHandler
}
final TradeList storeListSell = player.getSellList();
if ((storeListSell == null) && (storeListSell.getItemCount() == 0))
if ((storeListSell == null) || (storeListSell.getItemCount() == 0))
{
player.sendMessage("Your sell list is empty.");
player.sendPacket(ActionFailed.STATIC_PACKET);
@ -143,7 +143,6 @@ public class OfflineShop implements IVoicedCommandHandler
player.sendMessage("Your private store has succesfully been flagged as an offline shop and will remain active for ever.");
player.logout();
return true;
}

107
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/hitConditionBonus.java
View File

@ -85,78 +85,75 @@ public class hitConditionBonus
factory.setIgnoringElementContentWhitespace(true);
factory.setIgnoringComments(true);
final File file = new File(Config.DATAPACK_ROOT, "data/stats/hitConditionBonus.xml");
Document doc = null;
if (file.exists())
{
try
{
doc = factory.newDocumentBuilder().parse(file);
}
catch (Exception e)
{
LOGGER.warning("[hitConditionBonus] Could not parse file: " + e.getMessage());
}
String name;
for (@SuppressWarnings("null")
Node list = doc.getFirstChild(); list != null; list = list.getNextSibling())
{
if ("hitConditionBonus".equalsIgnoreCase(list.getNodeName()) || "list".equalsIgnoreCase(list.getNodeName()))
String name;
final Document doc = factory.newDocumentBuilder().parse(file);
for (Node list = doc.getFirstChild(); list != null; list = list.getNextSibling())
{
for (Node cond = list.getFirstChild(); cond != null; cond = cond.getNextSibling())
if ("hitConditionBonus".equalsIgnoreCase(list.getNodeName()) || "list".equalsIgnoreCase(list.getNodeName()))
{
int bonus = 0;
name = cond.getNodeName();
try
for (Node cond = list.getFirstChild(); cond != null; cond = cond.getNextSibling())
{
if (cond.hasAttributes())
int bonus = 0;
name = cond.getNodeName();
try
{
bonus = Integer.parseInt(cond.getAttributes().getNamedItem("val").getNodeValue());
if (cond.hasAttributes())
{
bonus = Integer.parseInt(cond.getAttributes().getNamedItem("val").getNodeValue());
}
}
}
catch (Exception e)
{
LOGGER.warning("[hitConditionBonus] Could not parse condition: " + e.getMessage());
}
finally
{
switch (name)
catch (Exception e)
{
case "front":
LOGGER.warning("[hitConditionBonus] Could not parse condition: " + e.getMessage());
}
finally
{
switch (name)
{
frontBonus = bonus;
break;
}
case "side":
{
sideBonus = bonus;
break;
}
case "back":
{
backBonus = bonus;
break;
}
case "high":
{
highBonus = bonus;
break;
}
case "low":
{
lowBonus = bonus;
break;
}
case "dark":
{
darkBonus = bonus;
break;
case "front":
{
frontBonus = bonus;
break;
}
case "side":
{
sideBonus = bonus;
break;
}
case "back":
{
backBonus = bonus;
break;
}
case "high":
{
highBonus = bonus;
break;
}
case "low":
{
lowBonus = bonus;
break;
}
case "dark":
{
darkBonus = bonus;
break;
}
}
}
}
}
}
}
catch (Exception e)
{
LOGGER.warning("[hitConditionBonus] Could not parse file: " + e.getMessage());
}
}
else
{