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

Sync with L2jServer HighFive Jul 14th 2015.

Browse Source
This commit is contained in:
MobiusDev
2015-07-14 19:55:19 +00:00
parent 54754b81b2
commit b07f46dc5c
29 changed files with 247 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
trunk/dist/game/data_classic/scripts/custom/events/Elpies/Elpies.java vendored
View File

@ -18,12 +18,12 @@
*/
package custom.events.Elpies;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ScheduledFuture;
import com.l2jserver.Config;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.datatables.SpawnTable;
import com.l2jserver.gameserver.model.L2Spawn;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2EventMonsterInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@ -64,8 +64,8 @@ public final class Elpies extends Event
// @formatter:on
// Non-final variables
private static boolean EVENT_ACTIVE = false;
private static int CURRENT_ELPY_COUNT = 0;
private ScheduledFuture<?> _eventTask = null;
private final Set<L2Npc> _elpies = ConcurrentHashMap.newKeySet(ELPY_AMOUNT);
private Elpies()
{
@ -101,13 +101,11 @@ public final class Elpies extends Event
EventLocation[] locations = EventLocation.values();
EventLocation randomLoc = locations[getRandom(locations.length)];
CURRENT_ELPY_COUNT = 0;
long despawnDelay = EVENT_DURATION_MINUTES * 60000;
for (int i = 0; i < ELPY_AMOUNT; i++)
{
addSpawn(ELPY, randomLoc.getRandomX(), randomLoc.getRandomY(), randomLoc.getZ(), 0, true, despawnDelay);
CURRENT_ELPY_COUNT++;
_elpies.add(addSpawn(ELPY, randomLoc.getRandomX(), randomLoc.getRandomY(), randomLoc.getZ(), 0, true, despawnDelay));
}
Broadcast.toAllOnlinePlayers("*Squeak Squeak*");
@ -139,14 +137,11 @@ public final class Elpies extends Event
_eventTask = null;
}
for (L2Spawn spawn : SpawnTable.getInstance().getSpawns(ELPY))
for (L2Npc npc : _elpies)
{
L2Npc npc = spawn.getLastSpawn();
if (npc != null)
{
npc.deleteMe();
}
npc.deleteMe();
}
_elpies.clear();
Broadcast.toAllOnlinePlayers("*Squeak Squeak*");
Broadcast.toAllOnlinePlayers("Elpy Event finished!");
@ -158,11 +153,12 @@ public final class Elpies extends Event
{
if (EVENT_ACTIVE)
{
_elpies.remove(npc);
dropItem(npc, killer, DROPLIST_CONSUMABLES);
dropItem(npc, killer, DROPLIST_CRYSTALS);
CURRENT_ELPY_COUNT--;
if (CURRENT_ELPY_COUNT <= 0)
if (_elpies.isEmpty())
{
Broadcast.toAllOnlinePlayers("All elpies have been killed!");
eventStop();

16
trunk/dist/game/data_classic/scripts/custom/events/Rabbits/Rabbits.java vendored
View File

@ -20,7 +20,8 @@ package custom.events.Rabbits;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import com.l2jserver.Config;
import com.l2jserver.gameserver.model.L2Object;
@ -51,7 +52,7 @@ public final class Rabbits extends Event
private static final int EVENT_TIME = 10;
private static final int TOTAL_CHEST_COUNT = 75;
private static final int TRANSFORMATION_ID = 105;
private final List<L2Npc> _npcs = new CopyOnWriteArrayList<>();
private final Set<L2Npc> _npcs = ConcurrentHashMap.newKeySet(TOTAL_CHEST_COUNT + 1);
private final List<L2PcInstance> _players = new ArrayList<>();
private boolean _isActive = false;
@ -142,16 +143,13 @@ public final class Rabbits extends Event
// Despawn NPCs
for (L2Npc npc : _npcs)
{
if (npc != null)
{
npc.deleteMe();
}
npc.deleteMe();
}
_npcs.clear();
for (L2PcInstance player : _players)
{
if ((player != null) && (player.getTransformationId() == TRANSFORMATION_ID))
if (player.getTransformationId() == TRANSFORMATION_ID)
{
player.untransform();
}
@ -213,7 +211,7 @@ public final class Rabbits extends Event
npc.deleteMe();
_npcs.remove(npc);
if (_npcs.size() <= 1)
if (_npcs.isEmpty())
{
Broadcast.toAllOnlinePlayers("Rabbits Event: No more chests...");
eventStop();
@ -253,7 +251,7 @@ public final class Rabbits extends Event
}
}
private static void recordSpawn(List<L2Npc> npcs, int npcId, int x, int y, int z, int heading, boolean randomOffSet, long despawnDelay)
private static void recordSpawn(Set<L2Npc> npcs, int npcId, int x, int y, int z, int heading, boolean randomOffSet, long despawnDelay)
{
final L2Npc npc = addSpawn(npcId, x, y, z, heading, randomOffSet, despawnDelay);
if (npc.getId() == CHEST)

39
trunk/dist/game/data_classic/scripts/custom/events/Race/Race.java vendored
View File

@ -18,15 +18,13 @@
*/
package custom.events.Race;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ScheduledFuture;
import com.l2jserver.Config;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.datatables.SkillData;
import com.l2jserver.gameserver.enums.ChatType;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Event;
@ -43,11 +41,11 @@ import com.l2jserver.gameserver.util.Broadcast;
public final class Race extends Event
{
// Event NPC's list
private List<L2Npc> _npclist;
private final Set<L2Npc> _npcs = ConcurrentHashMap.newKeySet();
// Npc
private L2Npc _npc;
// Player list
private List<L2PcInstance> _players;
private final Set<L2PcInstance> _players = ConcurrentHashMap.newKeySet();
// Event Task
ScheduledFuture<?> _eventTask = null;
// Event state
@ -121,6 +119,7 @@ public final class Race extends Event
{
return false;
}
// Check Custom Table - we use custom NPC's
if (!Config.CUSTOM_NPC_DATA)
{
@ -128,9 +127,7 @@ public final class Race extends Event
eventMaker.sendMessage("Event " + getName() + " can't be started because custom NPC table is disabled!");
return false;
}
// Initialize list
_npclist = new ArrayList<>();
_players = new CopyOnWriteArrayList<>();
// Set Event active
_isactive = true;
// Spawn Manager
@ -168,7 +165,7 @@ public final class Race extends Event
// Transform players and send message
for (L2PcInstance player : _players)
{
if ((player != null) && player.isOnline())
if (player.isOnline())
{
if (player.isInsideRadius(_npc, 500, false, false))
{
@ -210,22 +207,19 @@ public final class Race extends Event
// Teleport to event start point
for (L2PcInstance player : _players)
{
if ((player != null) && player.isOnline())
if (player.isOnline())
{
player.untransform();
player.teleToLocation(_npc.getX(), _npc.getY(), _npc.getZ(), true);
}
}
// Despawn NPCs
for (L2Npc _npc : _npclist)
{
if (_npc != null)
{
_npc.deleteMe();
}
}
_npclist.clear();
_players.clear();
// Despawn NPCs
for (L2Npc _npc : _npcs)
{
_npc.deleteMe();
}
_npcs.clear();
// Announce event end
Broadcast.toAllOnlinePlayers("* Race Event finished *");
@ -356,10 +350,7 @@ public final class Race extends Event
private L2Npc recordSpawn(int npcId, int x, int y, int z, int heading, boolean randomOffSet, long despawnDelay)
{
final L2Npc npc = addSpawn(npcId, x, y, z, heading, randomOffSet, despawnDelay);
if (npc != null)
{
_npclist.add(npc);
}
_npcs.add(npc);
return npc;
}