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

Sync with L2jUnity (7db5b4f).

Browse Source
This commit is contained in:
MobiusDev
2016-12-04 21:28:20 +00:00
parent 9e1d3569f0
commit b9d3c99cf1
412 changed files with 13806 additions and 10065 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
L2J_Mobius_Underground/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
View File

@ -60,8 +60,8 @@ public class ClanEntryManager
private static final String INSERT_WAITING_LIST = "INSERT INTO pledge_waiting_list VALUES (?, ?)";
private static final String DELETE_WAITING_LIST = "DELETE FROM pledge_waiting_list WHERE char_id = ?";
private static final String INSERT_CLAN_RECRUIT = "INSERT INTO pledge_recruit VALUES (?, ?, ?, ?)";
private static final String UPDATE_CLAN_RECRUIT = "UPDATE pledge_recruit SET karma = ?, information = ?, detailed_information = ? WHERE clan_id = ?";
private static final String INSERT_CLAN_RECRUIT = "INSERT INTO pledge_recruit VALUES (?, ?, ?, ?, ?, ?)";
private static final String UPDATE_CLAN_RECRUIT = "UPDATE pledge_recruit SET karma = ?, information = ?, detailed_information = ?, application_type = ?, recruit_type = ? WHERE clan_id = ?";
private static final String DELETE_CLAN_RECRUIT = "DELETE FROM pledge_recruit WHERE clan_id = ?";
//@formatter:off
@ -97,7 +97,7 @@ public class ClanEntryManager
{
while (rs.next())
{
_clanList.put(rs.getInt("clan_id"), new PledgeRecruitInfo(rs.getInt("clan_id"), rs.getInt("karma"), rs.getString("information"), rs.getString("detailed_information")));
_clanList.put(rs.getInt("clan_id"), new PledgeRecruitInfo(rs.getInt("clan_id"), rs.getInt("karma"), rs.getString("information"), rs.getString("detailed_information"), rs.getInt("application_type"), rs.getInt("recruit_type")));
}
LOGGER.info(getClass().getSimpleName() + ": Loaded: " + _clanList.size() + " clan entry");
}
@ -265,6 +265,8 @@ public class ClanEntryManager
statement.setInt(2, info.getKarma());
statement.setString(3, info.getInformation());
statement.setString(4, info.getDetailedInformation());
statement.setInt(5, info.getApplicationType());
statement.setInt(6, info.getRecruitType());
statement.executeUpdate();
}
catch (Exception e)
@ -286,7 +288,9 @@ public class ClanEntryManager
statement.setInt(1, info.getKarma());
statement.setString(2, info.getInformation());
statement.setString(3, info.getDetailedInformation());
statement.setInt(4, info.getClanId());
statement.setInt(4, info.getApplicationType());
statement.setInt(5, info.getRecruitType());
statement.setInt(6, info.getClanId());
statement.executeUpdate();
}
catch (Exception e)

27
L2J_Mobius_Underground/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
View File

@ -101,7 +101,7 @@ public class DBSpawnManager
spawn.setAmount(1);
spawn.setHeading(rset.getInt("heading"));
final List<NpcSpawnTemplate> spawns = SpawnsData.getInstance().getSpawns(npc -> (npc.getId() == template.getId()) && npc.hasDBSave());
final List<NpcSpawnTemplate> spawns = SpawnsData.getInstance().getNpcSpawns(npc -> (npc.getId() == template.getId()) && npc.hasDBSave());
if (spawns.isEmpty())
{
LOGGER.warning(getClass().getSimpleName() + ": Couldn't find spawn declaration for npc: " + template.getId() + " - " + template.getName());
@ -383,28 +383,15 @@ public class DBSpawnManager
}
final int npcId = spawn.getId();
if (!_spawns.containsKey(npcId))
{
return;
}
SpawnTable.getInstance().deleteSpawn(spawn, false);
_spawns.remove(npcId);
_npcs.remove(npcId);
_storedInfo.remove(npcId);
if (_npcs.containsKey(npcId))
final ScheduledFuture<?> task = _schedules.remove(npcId);
if (task != null)
{
_npcs.remove(npcId);
}
if (_schedules.containsKey(npcId))
{
final ScheduledFuture<?> f = _schedules.remove(npcId);
f.cancel(true);
}
if (_storedInfo.containsKey(npcId))
{
_storedInfo.remove(npcId);
task.cancel(true);
}
if (updateDb)
@ -421,6 +408,8 @@ public class DBSpawnManager
LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Could not remove npc #" + npcId + " from DB: ", e);
}
}
SpawnTable.getInstance().deleteSpawn(spawn, false);
}
/**