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

TvT concurrent player lists.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-09-21 07:40:35 +00:00
parent 0d62bacb31
commit 0956ba2a84
15 changed files with 135 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java vendored
View File

@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.Config; import org.l2jmobius.Config;
@@ -109,9 +110,9 @@ public class TvT extends Event
private static final ItemHolder REWARD = new ItemHolder(57, 1000000); // Adena private static final ItemHolder REWARD = new ItemHolder(57, 1000000); // Adena
// Misc // Misc
private static final Map<PlayerInstance, Integer> PLAYER_SCORES = new ConcurrentHashMap<>(); private static final Map<PlayerInstance, Integer> PLAYER_SCORES = new ConcurrentHashMap<>();
private static final List<PlayerInstance> PLAYER_LIST = new ArrayList<>(); private static final Set<PlayerInstance> PLAYER_LIST = ConcurrentHashMap.newKeySet();
private static final List<PlayerInstance> BLUE_TEAM = new ArrayList<>(); private static final Set<PlayerInstance> BLUE_TEAM = ConcurrentHashMap.newKeySet();
private static final List<PlayerInstance> RED_TEAM = new ArrayList<>(); private static final Set<PlayerInstance> RED_TEAM = ConcurrentHashMap.newKeySet();
private static volatile int BLUE_SCORE; private static volatile int BLUE_SCORE;
private static volatile int RED_SCORE; private static volatile int RED_SCORE;
private static Instance PVP_WORLD = null; private static Instance PVP_WORLD = null;
@@ -235,7 +236,11 @@ public class TvT extends Event
final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID); final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
PVP_WORLD = manager.createInstance(template, null); PVP_WORLD = manager.createInstance(template, null);
// Randomize player list and separate teams. // Randomize player list and separate teams.
Collections.shuffle(PLAYER_LIST); final List<PlayerInstance> playerList = new ArrayList<>(PLAYER_LIST.size());
playerList.addAll(PLAYER_LIST);
Collections.shuffle(playerList);
PLAYER_LIST.clear();
PLAYER_LIST.addAll(playerList);
boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes. boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
for (PlayerInstance participant : PLAYER_LIST) for (PlayerInstance participant : PLAYER_LIST)
{ {

13
L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java vendored
View File

@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.Config; import org.l2jmobius.Config;
@@ -109,9 +110,9 @@ public class TvT extends Event
private static final ItemHolder REWARD = new ItemHolder(57, 1000000); // Adena private static final ItemHolder REWARD = new ItemHolder(57, 1000000); // Adena
// Misc // Misc
private static final Map<PlayerInstance, Integer> PLAYER_SCORES = new ConcurrentHashMap<>(); private static final Map<PlayerInstance, Integer> PLAYER_SCORES = new ConcurrentHashMap<>();
private static final List<PlayerInstance> PLAYER_LIST = new ArrayList<>(); private static final Set<PlayerInstance> PLAYER_LIST = ConcurrentHashMap.newKeySet();
private static final List<PlayerInstance> BLUE_TEAM = new ArrayList<>(); private static final Set<PlayerInstance> BLUE_TEAM = ConcurrentHashMap.newKeySet();
private static final List<PlayerInstance> RED_TEAM = new ArrayList<>(); private static final Set<PlayerInstance> RED_TEAM = ConcurrentHashMap.newKeySet();
private static volatile int BLUE_SCORE; private static volatile int BLUE_SCORE;
private static volatile int RED_SCORE; private static volatile int RED_SCORE;
private static Instance PVP_WORLD = null; private static Instance PVP_WORLD = null;
@@ -235,7 +236,11 @@ public class TvT extends Event
final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID); final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
PVP_WORLD = manager.createInstance(template, null); PVP_WORLD = manager.createInstance(template, null);
// Randomize player list and separate teams. // Randomize player list and separate teams.
Collections.shuffle(PLAYER_LIST); final List<PlayerInstance> playerList = new ArrayList<>(PLAYER_LIST.size());
playerList.addAll(PLAYER_LIST);
Collections.shuffle(playerList);
PLAYER_LIST.clear();
PLAYER_LIST.addAll(playerList);
boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes. boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
for (PlayerInstance participant : PLAYER_LIST) for (PlayerInstance participant : PLAYER_LIST)
{ {

13
L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java vendored
View File

@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.Config; import org.l2jmobius.Config;
@@ -109,9 +110,9 @@ public class TvT extends Event
private static final ItemHolder REWARD = new ItemHolder(57, 1000000); // Adena private static final ItemHolder REWARD = new ItemHolder(57, 1000000); // Adena
// Misc // Misc
private static final Map<PlayerInstance, Integer> PLAYER_SCORES = new ConcurrentHashMap<>(); private static final Map<PlayerInstance, Integer> PLAYER_SCORES = new ConcurrentHashMap<>();
private static final List<PlayerInstance> PLAYER_LIST = new ArrayList<>(); private static final Set<PlayerInstance> PLAYER_LIST = ConcurrentHashMap.newKeySet();
private static final List<PlayerInstance> BLUE_TEAM = new ArrayList<>(); private static final Set<PlayerInstance> BLUE_TEAM = ConcurrentHashMap.newKeySet();
private static final List<PlayerInstance> RED_TEAM = new ArrayList<>(); private static final Set<PlayerInstance> RED_TEAM = ConcurrentHashMap.newKeySet();
private static volatile int BLUE_SCORE; private static volatile int BLUE_SCORE;
private static volatile int RED_SCORE; private static volatile int RED_SCORE;
private static Instance PVP_WORLD = null; private static Instance PVP_WORLD = null;
@@ -235,7 +236,11 @@ public class TvT extends Event
final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID); final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
PVP_WORLD = manager.createInstance(template, null); PVP_WORLD = manager.createInstance(template, null);
// Randomize player list and separate teams. // Randomize player list and separate teams.
Collections.shuffle(PLAYER_LIST); final List<PlayerInstance> playerList = new ArrayList<>(PLAYER_LIST.size());
playerList.addAll(PLAYER_LIST);
Collections.shuffle(playerList);
PLAYER_LIST.clear();
PLAYER_LIST.addAll(playerList);
boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes. boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
for (PlayerInstance participant : PLAYER_LIST) for (PlayerInstance participant : PLAYER_LIST)
{ {

13
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java vendored
View File

@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.Config; import org.l2jmobius.Config;
@@ -109,9 +110,9 @@ public class TvT extends Event
private static final ItemHolder REWARD = new ItemHolder(57, 1000000); // Adena private static final ItemHolder REWARD = new ItemHolder(57, 1000000); // Adena
// Misc // Misc
private static final Map<PlayerInstance, Integer> PLAYER_SCORES = new ConcurrentHashMap<>(); private static final Map<PlayerInstance, Integer> PLAYER_SCORES = new ConcurrentHashMap<>();
private static final List<PlayerInstance> PLAYER_LIST = new ArrayList<>(); private static final Set<PlayerInstance> PLAYER_LIST = ConcurrentHashMap.newKeySet();
private static final List<PlayerInstance> BLUE_TEAM = new ArrayList<>(); private static final Set<PlayerInstance> BLUE_TEAM = ConcurrentHashMap.newKeySet();
private static final List<PlayerInstance> RED_TEAM = new ArrayList<>(); private static final Set<PlayerInstance> RED_TEAM = ConcurrentHashMap.newKeySet();
private static volatile int BLUE_SCORE; private static volatile int BLUE_SCORE;
private static volatile int RED_SCORE; private static volatile int RED_SCORE;
private static Instance PVP_WORLD = null; private static Instance PVP_WORLD = null;
@@ -235,7 +236,11 @@ public class TvT extends Event
final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID); final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
PVP_WORLD = manager.createInstance(template, null); PVP_WORLD = manager.createInstance(template, null);
// Randomize player list and separate teams. // Randomize player list and separate teams.
Collections.shuffle(PLAYER_LIST); final List<PlayerInstance> playerList = new ArrayList<>(PLAYER_LIST.size());
playerList.addAll(PLAYER_LIST);
Collections.shuffle(playerList);
PLAYER_LIST.clear();
PLAYER_LIST.addAll(playerList);
boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes. boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
for (PlayerInstance participant : PLAYER_LIST) for (PlayerInstance participant : PLAYER_LIST)
{ {

13
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java vendored
View File

@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.Config; import org.l2jmobius.Config;
@@ -107,9 +108,9 @@ public class TvT extends Event
private static final ItemHolder REWARD = new ItemHolder(57, 1000000); // Adena private static final ItemHolder REWARD = new ItemHolder(57, 1000000); // Adena
// Misc // Misc
private static final Map<PlayerInstance, Integer> PLAYER_SCORES = new ConcurrentHashMap<>(); private static final Map<PlayerInstance, Integer> PLAYER_SCORES = new ConcurrentHashMap<>();
private static final List<PlayerInstance> PLAYER_LIST = new ArrayList<>(); private static final Set<PlayerInstance> PLAYER_LIST = ConcurrentHashMap.newKeySet();
private static final List<PlayerInstance> BLUE_TEAM = new ArrayList<>(); private static final Set<PlayerInstance> BLUE_TEAM = ConcurrentHashMap.newKeySet();
private static final List<PlayerInstance> RED_TEAM = new ArrayList<>(); private static final Set<PlayerInstance> RED_TEAM = ConcurrentHashMap.newKeySet();
private static volatile int BLUE_SCORE; private static volatile int BLUE_SCORE;
private static volatile int RED_SCORE; private static volatile int RED_SCORE;
private static Instance PVP_WORLD = null; private static Instance PVP_WORLD = null;
@@ -233,7 +234,11 @@ public class TvT extends Event
final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID); final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
PVP_WORLD = manager.createInstance(template, null); PVP_WORLD = manager.createInstance(template, null);
// Randomize player list and separate teams. // Randomize player list and separate teams.
Collections.shuffle(PLAYER_LIST); final List<PlayerInstance> playerList = new ArrayList<>(PLAYER_LIST.size());
playerList.addAll(PLAYER_LIST);
Collections.shuffle(playerList);
PLAYER_LIST.clear();
PLAYER_LIST.addAll(playerList);
boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes. boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
for (PlayerInstance participant : PLAYER_LIST) for (PlayerInstance participant : PLAYER_LIST)
{ {

13
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java vendored
View File

@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.Config; import org.l2jmobius.Config;
@@ -107,9 +108,9 @@ public class TvT extends Event
private static final ItemHolder REWARD = new ItemHolder(57, 1000000); // Adena private static final ItemHolder REWARD = new ItemHolder(57, 1000000); // Adena
// Misc // Misc
private static final Map<PlayerInstance, Integer> PLAYER_SCORES = new ConcurrentHashMap<>(); private static final Map<PlayerInstance, Integer> PLAYER_SCORES = new ConcurrentHashMap<>();
private static final List<PlayerInstance> PLAYER_LIST = new ArrayList<>(); private static final Set<PlayerInstance> PLAYER_LIST = ConcurrentHashMap.newKeySet();
private static final List<PlayerInstance> BLUE_TEAM = new ArrayList<>(); private static final Set<PlayerInstance> BLUE_TEAM = ConcurrentHashMap.newKeySet();
private static final List<PlayerInstance> RED_TEAM = new ArrayList<>(); private static final Set<PlayerInstance> RED_TEAM = ConcurrentHashMap.newKeySet();
private static volatile int BLUE_SCORE; private static volatile int BLUE_SCORE;
private static volatile int RED_SCORE; private static volatile int RED_SCORE;
private static Instance PVP_WORLD = null; private static Instance PVP_WORLD = null;
@@ -233,7 +234,11 @@ public class TvT extends Event
final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID); final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
PVP_WORLD = manager.createInstance(template, null); PVP_WORLD = manager.createInstance(template, null);
// Randomize player list and separate teams. // Randomize player list and separate teams.
Collections.shuffle(PLAYER_LIST); final List<PlayerInstance> playerList = new ArrayList<>(PLAYER_LIST.size());
playerList.addAll(PLAYER_LIST);
Collections.shuffle(playerList);
PLAYER_LIST.clear();
PLAYER_LIST.addAll(playerList);
boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes. boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
for (PlayerInstance participant : PLAYER_LIST) for (PlayerInstance participant : PLAYER_LIST)
{ {

13
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java vendored
View File

@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.Config; import org.l2jmobius.Config;
@@ -107,9 +108,9 @@ public class TvT extends Event
private static final ItemHolder REWARD = new ItemHolder(57, 1000000); // Adena private static final ItemHolder REWARD = new ItemHolder(57, 1000000); // Adena
// Misc // Misc
private static final Map<PlayerInstance, Integer> PLAYER_SCORES = new ConcurrentHashMap<>(); private static final Map<PlayerInstance, Integer> PLAYER_SCORES = new ConcurrentHashMap<>();
private static final List<PlayerInstance> PLAYER_LIST = new ArrayList<>(); private static final Set<PlayerInstance> PLAYER_LIST = ConcurrentHashMap.newKeySet();
private static final List<PlayerInstance> BLUE_TEAM = new ArrayList<>(); private static final Set<PlayerInstance> BLUE_TEAM = ConcurrentHashMap.newKeySet();
private static final List<PlayerInstance> RED_TEAM = new ArrayList<>(); private static final Set<PlayerInstance> RED_TEAM = ConcurrentHashMap.newKeySet();
private static volatile int BLUE_SCORE; private static volatile int BLUE_SCORE;
private static volatile int RED_SCORE; private static volatile int RED_SCORE;
private static Instance PVP_WORLD = null; private static Instance PVP_WORLD = null;
@@ -233,7 +234,11 @@ public class TvT extends Event
final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID); final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
PVP_WORLD = manager.createInstance(template, null); PVP_WORLD = manager.createInstance(template, null);
// Randomize player list and separate teams. // Randomize player list and separate teams.
Collections.shuffle(PLAYER_LIST); final List<PlayerInstance> playerList = new ArrayList<>(PLAYER_LIST.size());
playerList.addAll(PLAYER_LIST);
Collections.shuffle(playerList);
PLAYER_LIST.clear();
PLAYER_LIST.addAll(playerList);
boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes. boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
for (PlayerInstance participant : PLAYER_LIST) for (PlayerInstance participant : PLAYER_LIST)
{ {

13
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java vendored
View File

@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.Config; import org.l2jmobius.Config;
@@ -107,9 +108,9 @@ public class TvT extends Event
private static final ItemHolder REWARD = new ItemHolder(57, 1000000); // Adena private static final ItemHolder REWARD = new ItemHolder(57, 1000000); // Adena
// Misc // Misc
private static final Map<PlayerInstance, Integer> PLAYER_SCORES = new ConcurrentHashMap<>(); private static final Map<PlayerInstance, Integer> PLAYER_SCORES = new ConcurrentHashMap<>();
private static final List<PlayerInstance> PLAYER_LIST = new ArrayList<>(); private static final Set<PlayerInstance> PLAYER_LIST = ConcurrentHashMap.newKeySet();
private static final List<PlayerInstance> BLUE_TEAM = new ArrayList<>(); private static final Set<PlayerInstance> BLUE_TEAM = ConcurrentHashMap.newKeySet();
private static final List<PlayerInstance> RED_TEAM = new ArrayList<>(); private static final Set<PlayerInstance> RED_TEAM = ConcurrentHashMap.newKeySet();
private static volatile int BLUE_SCORE; private static volatile int BLUE_SCORE;
private static volatile int RED_SCORE; private static volatile int RED_SCORE;
private static Instance PVP_WORLD = null; private static Instance PVP_WORLD = null;
@@ -233,7 +234,11 @@ public class TvT extends Event
final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID); final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
PVP_WORLD = manager.createInstance(template, null); PVP_WORLD = manager.createInstance(template, null);
// Randomize player list and separate teams. // Randomize player list and separate teams.
Collections.shuffle(PLAYER_LIST); final List<PlayerInstance> playerList = new ArrayList<>(PLAYER_LIST.size());
playerList.addAll(PLAYER_LIST);
Collections.shuffle(playerList);
PLAYER_LIST.clear();
PLAYER_LIST.addAll(playerList);
boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes. boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
for (PlayerInstance participant : PLAYER_LIST) for (PlayerInstance participant : PLAYER_LIST)
{ {

13
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java vendored
View File

@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.Config; import org.l2jmobius.Config;
@@ -113,9 +114,9 @@ public class TvT extends Event
private static final ItemHolder REWARD = new ItemHolder(57, 100000); // Adena private static final ItemHolder REWARD = new ItemHolder(57, 100000); // Adena
// Misc // Misc
private static final Map<PlayerInstance, Integer> PLAYER_SCORES = new ConcurrentHashMap<>(); private static final Map<PlayerInstance, Integer> PLAYER_SCORES = new ConcurrentHashMap<>();
private static final List<PlayerInstance> PLAYER_LIST = new ArrayList<>(); private static final Set<PlayerInstance> PLAYER_LIST = ConcurrentHashMap.newKeySet();
private static final List<PlayerInstance> BLUE_TEAM = new ArrayList<>(); private static final Set<PlayerInstance> BLUE_TEAM = ConcurrentHashMap.newKeySet();
private static final List<PlayerInstance> RED_TEAM = new ArrayList<>(); private static final Set<PlayerInstance> RED_TEAM = ConcurrentHashMap.newKeySet();
private static volatile int BLUE_SCORE; private static volatile int BLUE_SCORE;
private static volatile int RED_SCORE; private static volatile int RED_SCORE;
private static Instance PVP_WORLD = null; private static Instance PVP_WORLD = null;
@@ -237,7 +238,11 @@ public class TvT extends Event
final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID); final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
PVP_WORLD = manager.createInstance(template, null); PVP_WORLD = manager.createInstance(template, null);
// Randomize player list and separate teams. // Randomize player list and separate teams.
Collections.shuffle(PLAYER_LIST); final List<PlayerInstance> playerList = new ArrayList<>(PLAYER_LIST.size());
playerList.addAll(PLAYER_LIST);
Collections.shuffle(playerList);
PLAYER_LIST.clear();
PLAYER_LIST.addAll(playerList);
boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes. boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
for (PlayerInstance participant : PLAYER_LIST) for (PlayerInstance participant : PLAYER_LIST)
{ {

13
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java vendored
View File

@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.Config; import org.l2jmobius.Config;
@@ -113,9 +114,9 @@ public class TvT extends Event
private static final ItemHolder REWARD = new ItemHolder(57, 100000); // Adena private static final ItemHolder REWARD = new ItemHolder(57, 100000); // Adena
// Misc // Misc
private static final Map<PlayerInstance, Integer> PLAYER_SCORES = new ConcurrentHashMap<>(); private static final Map<PlayerInstance, Integer> PLAYER_SCORES = new ConcurrentHashMap<>();
private static final List<PlayerInstance> PLAYER_LIST = new ArrayList<>(); private static final Set<PlayerInstance> PLAYER_LIST = ConcurrentHashMap.newKeySet();
private static final List<PlayerInstance> BLUE_TEAM = new ArrayList<>(); private static final Set<PlayerInstance> BLUE_TEAM = ConcurrentHashMap.newKeySet();
private static final List<PlayerInstance> RED_TEAM = new ArrayList<>(); private static final Set<PlayerInstance> RED_TEAM = ConcurrentHashMap.newKeySet();
private static volatile int BLUE_SCORE; private static volatile int BLUE_SCORE;
private static volatile int RED_SCORE; private static volatile int RED_SCORE;
private static Instance PVP_WORLD = null; private static Instance PVP_WORLD = null;
@@ -237,7 +238,11 @@ public class TvT extends Event
final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID); final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
PVP_WORLD = manager.createInstance(template, null); PVP_WORLD = manager.createInstance(template, null);
// Randomize player list and separate teams. // Randomize player list and separate teams.
Collections.shuffle(PLAYER_LIST); final List<PlayerInstance> playerList = new ArrayList<>(PLAYER_LIST.size());
playerList.addAll(PLAYER_LIST);
Collections.shuffle(playerList);
PLAYER_LIST.clear();
PLAYER_LIST.addAll(playerList);
boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes. boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
for (PlayerInstance participant : PLAYER_LIST) for (PlayerInstance participant : PLAYER_LIST)
{ {

13
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java vendored
View File

@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.Config; import org.l2jmobius.Config;
@@ -113,9 +114,9 @@ public class TvT extends Event
private static final ItemHolder REWARD = new ItemHolder(57, 100000); // Adena private static final ItemHolder REWARD = new ItemHolder(57, 100000); // Adena
// Misc // Misc
private static final Map<PlayerInstance, Integer> PLAYER_SCORES = new ConcurrentHashMap<>(); private static final Map<PlayerInstance, Integer> PLAYER_SCORES = new ConcurrentHashMap<>();
private static final List<PlayerInstance> PLAYER_LIST = new ArrayList<>(); private static final Set<PlayerInstance> PLAYER_LIST = ConcurrentHashMap.newKeySet();
private static final List<PlayerInstance> BLUE_TEAM = new ArrayList<>(); private static final Set<PlayerInstance> BLUE_TEAM = ConcurrentHashMap.newKeySet();
private static final List<PlayerInstance> RED_TEAM = new ArrayList<>(); private static final Set<PlayerInstance> RED_TEAM = ConcurrentHashMap.newKeySet();
private static volatile int BLUE_SCORE; private static volatile int BLUE_SCORE;
private static volatile int RED_SCORE; private static volatile int RED_SCORE;
private static Instance PVP_WORLD = null; private static Instance PVP_WORLD = null;
@@ -237,7 +238,11 @@ public class TvT extends Event
final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID); final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
PVP_WORLD = manager.createInstance(template, null); PVP_WORLD = manager.createInstance(template, null);
// Randomize player list and separate teams. // Randomize player list and separate teams.
Collections.shuffle(PLAYER_LIST); final List<PlayerInstance> playerList = new ArrayList<>(PLAYER_LIST.size());
playerList.addAll(PLAYER_LIST);
Collections.shuffle(playerList);
PLAYER_LIST.clear();
PLAYER_LIST.addAll(playerList);
boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes. boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
for (PlayerInstance participant : PLAYER_LIST) for (PlayerInstance participant : PLAYER_LIST)
{ {

13
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java vendored
View File

@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.Config; import org.l2jmobius.Config;
@@ -113,9 +114,9 @@ public class TvT extends Event
private static final ItemHolder REWARD = new ItemHolder(57, 100000); // Adena private static final ItemHolder REWARD = new ItemHolder(57, 100000); // Adena
// Misc // Misc
private static final Map<PlayerInstance, Integer> PLAYER_SCORES = new ConcurrentHashMap<>(); private static final Map<PlayerInstance, Integer> PLAYER_SCORES = new ConcurrentHashMap<>();
private static final List<PlayerInstance> PLAYER_LIST = new ArrayList<>(); private static final Set<PlayerInstance> PLAYER_LIST = ConcurrentHashMap.newKeySet();
private static final List<PlayerInstance> BLUE_TEAM = new ArrayList<>(); private static final Set<PlayerInstance> BLUE_TEAM = ConcurrentHashMap.newKeySet();
private static final List<PlayerInstance> RED_TEAM = new ArrayList<>(); private static final Set<PlayerInstance> RED_TEAM = ConcurrentHashMap.newKeySet();
private static volatile int BLUE_SCORE; private static volatile int BLUE_SCORE;
private static volatile int RED_SCORE; private static volatile int RED_SCORE;
private static Instance PVP_WORLD = null; private static Instance PVP_WORLD = null;
@@ -237,7 +238,11 @@ public class TvT extends Event
final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID); final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
PVP_WORLD = manager.createInstance(template, null); PVP_WORLD = manager.createInstance(template, null);
// Randomize player list and separate teams. // Randomize player list and separate teams.
Collections.shuffle(PLAYER_LIST); final List<PlayerInstance> playerList = new ArrayList<>(PLAYER_LIST.size());
playerList.addAll(PLAYER_LIST);
Collections.shuffle(playerList);
PLAYER_LIST.clear();
PLAYER_LIST.addAll(playerList);
boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes. boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
for (PlayerInstance participant : PLAYER_LIST) for (PlayerInstance participant : PLAYER_LIST)
{ {

13
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java vendored
View File

@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.Config; import org.l2jmobius.Config;
@@ -113,9 +114,9 @@ public class TvT extends Event
private static final ItemHolder REWARD = new ItemHolder(57, 100000); // Adena private static final ItemHolder REWARD = new ItemHolder(57, 100000); // Adena
// Misc // Misc
private static final Map<PlayerInstance, Integer> PLAYER_SCORES = new ConcurrentHashMap<>(); private static final Map<PlayerInstance, Integer> PLAYER_SCORES = new ConcurrentHashMap<>();
private static final List<PlayerInstance> PLAYER_LIST = new ArrayList<>(); private static final Set<PlayerInstance> PLAYER_LIST = ConcurrentHashMap.newKeySet();
private static final List<PlayerInstance> BLUE_TEAM = new ArrayList<>(); private static final Set<PlayerInstance> BLUE_TEAM = ConcurrentHashMap.newKeySet();
private static final List<PlayerInstance> RED_TEAM = new ArrayList<>(); private static final Set<PlayerInstance> RED_TEAM = ConcurrentHashMap.newKeySet();
private static volatile int BLUE_SCORE; private static volatile int BLUE_SCORE;
private static volatile int RED_SCORE; private static volatile int RED_SCORE;
private static Instance PVP_WORLD = null; private static Instance PVP_WORLD = null;
@@ -237,7 +238,11 @@ public class TvT extends Event
final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID); final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
PVP_WORLD = manager.createInstance(template, null); PVP_WORLD = manager.createInstance(template, null);
// Randomize player list and separate teams. // Randomize player list and separate teams.
Collections.shuffle(PLAYER_LIST); final List<PlayerInstance> playerList = new ArrayList<>(PLAYER_LIST.size());
playerList.addAll(PLAYER_LIST);
Collections.shuffle(playerList);
PLAYER_LIST.clear();
PLAYER_LIST.addAll(playerList);
boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes. boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
for (PlayerInstance participant : PLAYER_LIST) for (PlayerInstance participant : PLAYER_LIST)
{ {

13
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java vendored
View File

@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.Config; import org.l2jmobius.Config;
@@ -113,9 +114,9 @@ public class TvT extends Event
private static final ItemHolder REWARD = new ItemHolder(57, 100000); // Adena private static final ItemHolder REWARD = new ItemHolder(57, 100000); // Adena
// Misc // Misc
private static final Map<PlayerInstance, Integer> PLAYER_SCORES = new ConcurrentHashMap<>(); private static final Map<PlayerInstance, Integer> PLAYER_SCORES = new ConcurrentHashMap<>();
private static final List<PlayerInstance> PLAYER_LIST = new ArrayList<>(); private static final Set<PlayerInstance> PLAYER_LIST = ConcurrentHashMap.newKeySet();
private static final List<PlayerInstance> BLUE_TEAM = new ArrayList<>(); private static final Set<PlayerInstance> BLUE_TEAM = ConcurrentHashMap.newKeySet();
private static final List<PlayerInstance> RED_TEAM = new ArrayList<>(); private static final Set<PlayerInstance> RED_TEAM = ConcurrentHashMap.newKeySet();
private static volatile int BLUE_SCORE; private static volatile int BLUE_SCORE;
private static volatile int RED_SCORE; private static volatile int RED_SCORE;
private static Instance PVP_WORLD = null; private static Instance PVP_WORLD = null;
@@ -237,7 +238,11 @@ public class TvT extends Event
final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID); final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
PVP_WORLD = manager.createInstance(template, null); PVP_WORLD = manager.createInstance(template, null);
// Randomize player list and separate teams. // Randomize player list and separate teams.
Collections.shuffle(PLAYER_LIST); final List<PlayerInstance> playerList = new ArrayList<>(PLAYER_LIST.size());
playerList.addAll(PLAYER_LIST);
Collections.shuffle(playerList);
PLAYER_LIST.clear();
PLAYER_LIST.addAll(playerList);
boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes. boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
for (PlayerInstance participant : PLAYER_LIST) for (PlayerInstance participant : PLAYER_LIST)
{ {

13
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java vendored
View File

@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.Config; import org.l2jmobius.Config;
@@ -113,9 +114,9 @@ public class TvT extends Event
private static final ItemHolder REWARD = new ItemHolder(57, 100000); // Adena private static final ItemHolder REWARD = new ItemHolder(57, 100000); // Adena
// Misc // Misc
private static final Map<PlayerInstance, Integer> PLAYER_SCORES = new ConcurrentHashMap<>(); private static final Map<PlayerInstance, Integer> PLAYER_SCORES = new ConcurrentHashMap<>();
private static final List<PlayerInstance> PLAYER_LIST = new ArrayList<>(); private static final Set<PlayerInstance> PLAYER_LIST = ConcurrentHashMap.newKeySet();
private static final List<PlayerInstance> BLUE_TEAM = new ArrayList<>(); private static final Set<PlayerInstance> BLUE_TEAM = ConcurrentHashMap.newKeySet();
private static final List<PlayerInstance> RED_TEAM = new ArrayList<>(); private static final Set<PlayerInstance> RED_TEAM = ConcurrentHashMap.newKeySet();
private static volatile int BLUE_SCORE; private static volatile int BLUE_SCORE;
private static volatile int RED_SCORE; private static volatile int RED_SCORE;
private static Instance PVP_WORLD = null; private static Instance PVP_WORLD = null;
@@ -237,7 +238,11 @@ public class TvT extends Event
final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID); final InstanceTemplate template = manager.getInstanceTemplate(INSTANCE_ID);
PVP_WORLD = manager.createInstance(template, null); PVP_WORLD = manager.createInstance(template, null);
// Randomize player list and separate teams. // Randomize player list and separate teams.
Collections.shuffle(PLAYER_LIST); final List<PlayerInstance> playerList = new ArrayList<>(PLAYER_LIST.size());
playerList.addAll(PLAYER_LIST);
Collections.shuffle(playerList);
PLAYER_LIST.clear();
PLAYER_LIST.addAll(playerList);
boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes. boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
for (PlayerInstance participant : PLAYER_LIST) for (PlayerInstance participant : PLAYER_LIST)
{ {