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

13
trunk/java/com/l2jmobius/gameserver/instancemanager/FactionManager.java
View File

@@ -52,8 +52,7 @@ public class FactionManager
{
while (rs.next())
{
final int id = rs.getInt(1);
_playerFactions.put(id, rs.getInt(2));
_playerFactions.put(rs.getInt(1), rs.getInt(2));
}
}
catch (SQLException e)
@@ -101,15 +100,7 @@ public class FactionManager
public final boolean isSameFaction(L2PcInstance player1, L2PcInstance player2)
{
// TODO: Maybe add support for multiple factions?
// if (getFactionByCharId(player1.getId()) == getFactionByCharId(player2.getId()))
// {
// return true;
// }
if ((player1.isGood() && player2.isGood()) || (player1.isEvil() && player2.isEvil()))
{
return true;
}
return false;
return (player1.isGood() && player2.isGood()) || (player1.isEvil() && player2.isEvil());
}
public static FactionManager getInstance()