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

Code improvements.

Browse Source
This commit is contained in:
MobiusDev
2016-04-24 16:30:15 +00:00
parent 8bd51aba1c
commit 2dd14bef9b
860 changed files with 8865 additions and 17041 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
trunk/java/com/l2jmobius/gameserver/data/sql/impl/CharNameTable.java
View File

@ -52,21 +52,19 @@ public class CharNameTable
public final void addName(L2PcInstance player)
{
if (player != null)
if (player == null)
{
addName(player.getObjectId(), player.getName());
_accessLevels.put(player.getObjectId(), player.getAccessLevel().getLevel());
return;
}
addName(player.getObjectId(), player.getName());
_accessLevels.put(player.getObjectId(), player.getAccessLevel().getLevel());
}
private final void addName(int objectId, String name)
{
if (name != null)
if ((name != null) && !name.equals(_chars.get(objectId)))
{
if (!name.equals(_chars.get(objectId)))
{
_chars.put(objectId, name);
}
_chars.put(objectId, name);
}
}
@ -117,14 +115,14 @@ public class CharNameTable
_log.log(Level.WARNING, getClass().getSimpleName() + ": Could not check existing char name: " + e.getMessage(), e);
}
if (id > 0)
if (id <= 0)
{
_chars.put(id, name);
_accessLevels.put(id, accessLevel);
return id;
return -1; // not found
}
return -1; // not found
_chars.put(id, name);
_accessLevels.put(id, accessLevel);
return id;
}
public final String getNameById(int id)
@ -170,12 +168,7 @@ public class CharNameTable
public final int getAccessLevelById(int objectId)
{
if (getNameById(objectId) != null)
{
return _accessLevels.get(objectId);
}
return 0;
return getNameById(objectId) != null ? _accessLevels.get(objectId) : 0;
}
public synchronized boolean doesCharNameExist(String name)

32
trunk/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java
View File

@ -256,14 +256,7 @@ public class ClanTable
}
final L2ClanMember leaderMember = clan.getLeader();
if (leaderMember == null)
{
clan.getWarehouse().destroyAllItems("ClanRemove", null, null);
}
else
{
clan.getWarehouse().destroyAllItems("ClanRemove", clan.getLeader().getPlayerInstance(), null);
}
clan.getWarehouse().destroyAllItems("ClanRemove", leaderMember == null ? null : clan.getLeader().getPlayerInstance(), null);
for (L2ClanMember member : clan.getMembers())
{
@ -324,13 +317,9 @@ public class ClanTable
if (fortId != 0)
{
final Fort fort = FortManager.getInstance().getFortById(fortId);
if (fort != null)
if ((fort != null) && (clan == fort.getOwnerClan()))
{
final L2Clan owner = fort.getOwnerClan();
if (clan == owner)
{
fort.removeOwner(true);
}
fort.removeOwner(true);
}
}
@ -507,16 +496,13 @@ public class ClanTable
for (L2Clan clan : _clans.values())
{
final int allyId = clan.getAllyId();
if ((allyId != 0) && (clan.getId() != allyId))
if ((allyId != 0) && (clan.getId() != allyId) && !_clans.containsKey(allyId))
{
if (!_clans.containsKey(allyId))
{
clan.setAllyId(0);
clan.setAllyName(null);
clan.changeAllyCrest(0, true);
clan.updateClanInDB();
_log.info(getClass().getSimpleName() + ": Removed alliance from clan: " + clan);
}
clan.setAllyId(0);
clan.setAllyName(null);
clan.changeAllyCrest(0, true);
clan.updateClanInDB();
_log.info(getClass().getSimpleName() + ": Removed alliance from clan: " + clan);
}
}
}

33
trunk/java/com/l2jmobius/gameserver/data/sql/impl/CrestTable.java
View File

@ -114,34 +114,25 @@ public final class CrestTable
for (L2Clan clan : ClanTable.getInstance().getClans())
{
if (clan.getCrestId() != 0)
if ((clan.getCrestId() != 0) && (getCrest(clan.getCrestId()) == null))
{
if (getCrest(clan.getCrestId()) == null)
{
LOGGER.info("Removing non-existent crest for clan " + clan.getName() + " [" + clan.getId() + "], crestId:" + clan.getCrestId());
clan.setCrestId(0);
clan.changeClanCrest(0);
}
LOGGER.info("Removing non-existent crest for clan " + clan.getName() + " [" + clan.getId() + "], crestId:" + clan.getCrestId());
clan.setCrestId(0);
clan.changeClanCrest(0);
}
if (clan.getCrestLargeId() != 0)
if ((clan.getCrestLargeId() != 0) && (getCrest(clan.getCrestLargeId()) == null))
{
if (getCrest(clan.getCrestLargeId()) == null)
{
LOGGER.info("Removing non-existent large crest for clan " + clan.getName() + " [" + clan.getId() + "], crestLargeId:" + clan.getCrestLargeId());
clan.setCrestLargeId(0);
clan.changeLargeCrest(0);
}
LOGGER.info("Removing non-existent large crest for clan " + clan.getName() + " [" + clan.getId() + "], crestLargeId:" + clan.getCrestLargeId());
clan.setCrestLargeId(0);
clan.changeLargeCrest(0);
}
if (clan.getAllyCrestId() != 0)
if ((clan.getAllyCrestId() != 0) && (getCrest(clan.getAllyCrestId()) == null))
{
if (getCrest(clan.getAllyCrestId()) == null)
{
LOGGER.info("Removing non-existent ally crest for clan " + clan.getName() + " [" + clan.getId() + "], allyCrestId:" + clan.getAllyCrestId());
clan.setAllyCrestId(0);
clan.changeAllyCrest(0, true);
}
LOGGER.info("Removing non-existent ally crest for clan " + clan.getName() + " [" + clan.getId() + "], allyCrestId:" + clan.getAllyCrestId());
clan.setAllyCrestId(0);
clan.changeAllyCrest(0, true);
}
}
}

6
trunk/java/com/l2jmobius/gameserver/data/sql/impl/NpcBufferTable.java
View File

@ -184,11 +184,7 @@ public class NpcBufferTable
public NpcBufferData getSkillInfo(int npcId, int buffGroup)
{
final NpcBufferSkills skills = _buffers.get(npcId);
if (skills != null)
{
return skills.getSkillGroupInfo(buffGroup);
}
return null;
return skills != null ? skills.getSkillGroupInfo(buffGroup) : null;
}
public static NpcBufferTable getInstance()

6
trunk/java/com/l2jmobius/gameserver/data/sql/impl/SummonEffectsTable.java
View File

@ -45,11 +45,7 @@ public class SummonEffectsTable
private Map<Integer, Map<Integer, SummonEffect>> getServitorEffects(L2PcInstance owner)
{
final Map<Integer, Map<Integer, Map<Integer, SummonEffect>>> servitorMap = _servitorEffects.get(owner.getObjectId());
if (servitorMap == null)
{
return null;
}
return servitorMap.get(owner.getClassIndex());
return servitorMap == null ? null : servitorMap.get(owner.getClassIndex());
}
private Map<Integer, SummonEffect> getServitorEffects(L2PcInstance owner, int referenceSkill)

7
trunk/java/com/l2jmobius/gameserver/data/sql/impl/SummonSkillsTable.java
View File

@ -110,12 +110,9 @@ public class SummonSkillsTable
}
break;
}
else if (temp.getMinLevel() <= cha.getLevel())
if ((temp.getMinLevel() <= cha.getLevel()) && (temp.getLevel() > lvl))
{
if (temp.getLevel() > lvl)
{
lvl = temp.getLevel();
}
lvl = temp.getLevel();
}
}
return lvl;

54
trunk/java/com/l2jmobius/gameserver/data/sql/impl/TeleportLocationTable.java
View File

@ -68,38 +68,40 @@ public class TeleportLocationTable
LOGGER.log(Level.SEVERE, getClass().getSimpleName() + ": Error loading Teleport Table.", e);
}
if (Config.CUSTOM_TELEPORT_TABLE)
if (!Config.CUSTOM_TELEPORT_TABLE)
{
int _cTeleCount = _teleports.size();
try (Connection con = DatabaseFactory.getInstance().getConnection();
Statement s = con.createStatement();
ResultSet rs = s.executeQuery("SELECT id, loc_x, loc_y, loc_z, price, fornoble, itemId FROM custom_teleport"))
return;
}
int _cTeleCount = _teleports.size();
try (Connection con = DatabaseFactory.getInstance().getConnection();
Statement s = con.createStatement();
ResultSet rs = s.executeQuery("SELECT id, loc_x, loc_y, loc_z, price, fornoble, itemId FROM custom_teleport"))
{
L2TeleportLocation teleport;
while (rs.next())
{
L2TeleportLocation teleport;
while (rs.next())
{
teleport = new L2TeleportLocation();
teleport.setTeleId(rs.getInt("id"));
teleport.setLocX(rs.getInt("loc_x"));
teleport.setLocY(rs.getInt("loc_y"));
teleport.setLocZ(rs.getInt("loc_z"));
teleport.setPrice(rs.getInt("price"));
teleport.setIsForNoble(rs.getInt("fornoble") == 1);
teleport.setItemId(rs.getInt("itemId"));
_teleports.put(teleport.getTeleId(), teleport);
}
_cTeleCount = _teleports.size() - _cTeleCount;
if (_cTeleCount > 0)
{
LOGGER.info(getClass().getSimpleName() + ": Loaded " + _cTeleCount + " Custom Teleport Location Templates.");
}
teleport = new L2TeleportLocation();
teleport.setTeleId(rs.getInt("id"));
teleport.setLocX(rs.getInt("loc_x"));
teleport.setLocY(rs.getInt("loc_y"));
teleport.setLocZ(rs.getInt("loc_z"));
teleport.setPrice(rs.getInt("price"));
teleport.setIsForNoble(rs.getInt("fornoble") == 1);
teleport.setItemId(rs.getInt("itemId"));
_teleports.put(teleport.getTeleId(), teleport);
}
catch (Exception e)
_cTeleCount = _teleports.size() - _cTeleCount;
if (_cTeleCount > 0)
{
LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error while creating custom teleport table " + e.getMessage(), e);
LOGGER.info(getClass().getSimpleName() + ": Loaded " + _cTeleCount + " Custom Teleport Location Templates.");
}
}
catch (Exception e)
{
LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Error while creating custom teleport table " + e.getMessage(), e);
}
}
/**