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

Ceremony of Chaos additional logout check and reuse of getMembers method.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-11-19 23:55:37 +00:00
parent e33f1a2612
commit 8c24c02176
25 changed files with 1400 additions and 894 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java
View File

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.ceremonyofchaos;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.OptionalInt;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
@@ -113,10 +114,11 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
public void preparePlayers()
{
final ExCuriousHouseMemberList membersList = new ExCuriousHouseMemberList(_id, CeremonyOfChaosManager.getInstance().getMaxPlayersInArena(), getMembers().values());
final Map<Integer, CeremonyOfChaosMember> members = getMembers();
final ExCuriousHouseMemberList membersList = new ExCuriousHouseMemberList(_id, CeremonyOfChaosManager.getInstance().getMaxPlayersInArena(), members.values());
final NpcHtmlMessage msg = new NpcHtmlMessage(0);
int index = 0;
for (CeremonyOfChaosMember member : getMembers().values())
for (CeremonyOfChaosMember member : members.values())
{
final PlayerInstance player = member.getPlayer();
if (player.inObserverMode())
@@ -278,7 +280,8 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
public void stopFight()
{
for (CeremonyOfChaosMember member : getMembers().values())
final Map<Integer, CeremonyOfChaosMember> members = getMembers();
for (CeremonyOfChaosMember member : members.values())
{
if (member.getLifeTime() == 0)
{
@@ -288,7 +291,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
validateWinner();
final List<CeremonyOfChaosMember> winners = getWinners();
final List<CeremonyOfChaosMember> members = new ArrayList<>(getMembers().size());
final List<CeremonyOfChaosMember> memberList = new ArrayList<>(members.size());
SystemMessage msg = null;
if (winners.isEmpty() || (winners.size() > 1))
{
@@ -389,7 +392,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
}
}
for (CeremonyOfChaosMember member : getMembers().values())
for (CeremonyOfChaosMember member : members.values())
{
final PlayerInstance player = member.getPlayer();
if (player != null)
@@ -402,14 +405,14 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
// Send result
player.sendPacket(new ExCuriousHouseResult(member.getResultType(), this));
members.add(member);
memberList.add(member);
}
}
getTimers().cancelTimer("update", null, null);
final StatSet params = new StatSet();
params.set("time", 30);
getTimers().addTimer("match_end_countdown", params, 30 * 1000, null, null);
EventDispatcher.getInstance().notifyEvent(new OnCeremonyOfChaosMatchResult(winners, members));
EventDispatcher.getInstance().notifyEvent(new OnCeremonyOfChaosMatchResult(winners, memberList));
}
private void teleportPlayersOut()
@@ -474,14 +477,16 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
public List<CeremonyOfChaosMember> getWinners()
{
final List<CeremonyOfChaosMember> winners = new ArrayList<>();
final Map<Integer, CeremonyOfChaosMember> members = getMembers();
//@formatter:off
final OptionalInt winnerLifeTime = getMembers().values().stream()
final OptionalInt winnerLifeTime = members.values().stream()
.mapToInt(CeremonyOfChaosMember::getLifeTime)
.max();
if(winnerLifeTime.isPresent())
{
getMembers().values().stream()
members.values().stream()
.sorted(Comparator.comparingLong(CeremonyOfChaosMember::getLifeTime)
.reversed()
.thenComparingInt(CeremonyOfChaosMember::getScore)
@@ -491,6 +496,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
}
//@formatter:on
return winners;
}
@@ -507,13 +513,15 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
{
case "update":
{
final Map<Integer, CeremonyOfChaosMember> members = getMembers();
final int time = (int) CeremonyOfChaosManager.getInstance().getScheduler("stopFight").getRemainingTime(TimeUnit.SECONDS);
broadcastPacket(new ExCuriousHouseRemainTime(time));
getMembers().values().forEach(p -> broadcastPacket(new ExCuriousHouseMemberUpdate(p)));
members.values().forEach(p -> broadcastPacket(new ExCuriousHouseMemberUpdate(p)));
// Validate winner
int count = 0;
for (CeremonyOfChaosMember member : getMembers().values())
for (CeremonyOfChaosMember member : members.values())
{
if (!member.isDefeated())
{
@@ -605,7 +613,16 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
final PlayerInstance player = event.getPlayer();
if (player != null)
{
removeMember(player.getObjectId());
final Map<Integer, CeremonyOfChaosMember> members = getMembers();
final int playerObjectId = player.getObjectId();
if (members.containsKey(playerObjectId))
{
removeMember(playerObjectId);
if (members.size() <= 1)
{
stopFight();
}
}
}
}
@@ -617,8 +634,9 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
{
final PlayerInstance attackerPlayer = event.getAttacker().getActingPlayer();
final PlayerInstance targetPlayer = event.getTarget().getActingPlayer();
final CeremonyOfChaosMember attackerMember = getMembers().get(attackerPlayer.getObjectId());
final CeremonyOfChaosMember targetMember = getMembers().get(targetPlayer.getObjectId());
final Map<Integer, CeremonyOfChaosMember> members = getMembers();
final CeremonyOfChaosMember attackerMember = members.get(attackerPlayer.getObjectId());
final CeremonyOfChaosMember targetMember = members.get(targetPlayer.getObjectId());
final DeleteObject deleteObject = new DeleteObject(targetPlayer);
if ((attackerMember != null) && (targetMember != null))
{
@@ -629,7 +647,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent<CeremonyOfChaosMember>
targetMember.setDefeated(true);
// Delete target player
for (CeremonyOfChaosMember member : getMembers().values())
for (CeremonyOfChaosMember member : members.values())
{
if (member.getObjectId() != targetPlayer.getObjectId())
{