Skip to content
Snippets Groups Projects
Commit 40fd9061 authored by Rumen Nikiforov's avatar Rumen Nikiforov
Browse files

BETA: DP-Part for[L4795-4798]

parent a9e0d931
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 91 additions and 230 deletions
L2J_DataPack_BETA/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+ 39
− 44
View file @ 40fd9061
......@@ -109,6 +109,7 @@ public class AdminEffects implements IAdminCommandHandler
"admin_set_displayeffect_menu"
};
@Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
StringTokenizer st = new StringTokenizer(command);
......@@ -208,16 +209,13 @@ public class AdminEffects implements IAdminCommandHandler
try
{
Collection<L2PcInstance> plrs = activeChar.getKnownList().getKnownPlayers().values();
//synchronized (activeChar.getKnownList().getKnownPlayers())
for (L2PcInstance player : plrs)
{
for (L2PcInstance player : plrs)
if (!player.isGM())
{
if (!player.isGM())
{
player.startAbnormalEffect(AbnormalEffect.HOLD_1);
player.setIsParalyzed(true);
player.startParalyze();
}
player.startAbnormalEffect(AbnormalEffect.HOLD_1);
player.setIsParalyzed(true);
player.startParalyze();
}
}
}
......@@ -230,14 +228,11 @@ public class AdminEffects implements IAdminCommandHandler
try
{
Collection<L2PcInstance> plrs = activeChar.getKnownList().getKnownPlayers().values();
//synchronized (activeChar.getKnownList().getKnownPlayers())
for (L2PcInstance player : plrs)
{
for (L2PcInstance player : plrs)
{
player.stopAbnormalEffect(AbnormalEffect.HOLD_1);
player.setIsParalyzed(false);
player.stopParalyze(false);
}
player.stopAbnormalEffect(AbnormalEffect.HOLD_1);
player.setIsParalyzed(false);
player.stopParalyze(false);
}
}
catch (Exception e)
......@@ -395,13 +390,10 @@ public class AdminEffects implements IAdminCommandHandler
try
{
Collection<L2PcInstance> plrs = activeChar.getKnownList().getKnownPlayers().values();
//synchronized (activeChar.getKnownList().getKnownPlayers())
for (L2PcInstance player : plrs)
{
for (L2PcInstance player : plrs)
{
player.setTeam(0);
player.broadcastUserInfo();
}
player.setTeam(0);
player.broadcastUserInfo();
}
}
catch (Exception e)
......@@ -415,19 +407,17 @@ public class AdminEffects implements IAdminCommandHandler
String val = st.nextToken();
int teamVal = Integer.parseInt(val);
Collection<L2PcInstance> plrs = activeChar.getKnownList().getKnownPlayers().values();
//synchronized (activeChar.getKnownList().getKnownPlayers())
for (L2PcInstance player : plrs)
{
for (L2PcInstance player : plrs)
if (activeChar.isInsideRadius(player, 400, false, true))
{
if (activeChar.isInsideRadius(player, 400, false, true))
player.setTeam(teamVal);
if (teamVal != 0)
{
player.setTeam(teamVal);
if (teamVal != 0)
{
player.sendMessage("You have joined team " + teamVal);
}
player.broadcastUserInfo();
player.sendMessage("You have joined team " + teamVal);
}
player.broadcastUserInfo();
}
}
}
......@@ -484,11 +474,12 @@ public class AdminEffects implements IAdminCommandHandler
{
int radius = Integer.parseInt(target);
Collection<L2Object> objs = activeChar.getKnownList().getKnownObjects().values();
//synchronized (activeChar.getKnownList().getKnownObjects())
for (L2Object object : objs)
{
for (L2Object object : objs)
if (activeChar.isInsideRadius(object, radius, false, false))
performSocial(social, object, activeChar);
if (activeChar.isInsideRadius(object, radius, false, false))
{
performSocial(social, object, activeChar);
}
}
activeChar.sendMessage(radius + " units radius affected by your request.");
}
......@@ -546,13 +537,15 @@ public class AdminEffects implements IAdminCommandHandler
{
int radius = Integer.parseInt(target);
Collection<L2Object> objs = activeChar.getKnownList().getKnownObjects().values();
//synchronized (activeChar.getKnownList().getKnownObjects())
for (L2Object object : objs)
{
for (L2Object object : objs)
if (activeChar.isInsideRadius(object, radius, false, false))
performAbnormal(abnormal, object);
activeChar.sendMessage(radius + " units radius affected by your request.");
if (activeChar.isInsideRadius(object, radius, false, false))
{
performAbnormal(abnormal, object);
}
}
activeChar.sendMessage(radius + " units radius affected by your request.");
}
catch (NumberFormatException nbe)
{
......@@ -608,13 +601,14 @@ public class AdminEffects implements IAdminCommandHandler
{
int radius = Integer.parseInt(target);
Collection<L2Object> objs = activeChar.getKnownList().getKnownObjects().values();
//synchronized (activeChar.getKnownList().getKnownObjects())
for (L2Object object : objs)
{
for (L2Object object : objs)
if (activeChar.isInsideRadius(object, radius, false, false))
performSpecial(special, object);
activeChar.sendMessage(radius + " units radius affected by your request.");
if (activeChar.isInsideRadius(object, radius, false, false))
{
performSpecial(special, object);
}
}
activeChar.sendMessage(radius + " units radius affected by your request.");
}
catch (NumberFormatException nbe)
{
......@@ -807,6 +801,7 @@ public class AdminEffects implements IAdminCommandHandler
activeChar.sendMessage("Playing " + sound + ".");
}
@Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
......
L2J_DataPack_BETA/data/scripts/handlers/admincommandhandlers/AdminHeal.java
+ 9
− 9
View file @ 40fd9061
......@@ -42,6 +42,7 @@ public class AdminHeal implements IAdminCommandHandler
"admin_heal"
};
@Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
{
......@@ -64,6 +65,7 @@ public class AdminHeal implements IAdminCommandHandler
return true;
}
@Override
public String[] getAdminCommandList()
{
return ADMIN_COMMANDS;
......@@ -90,19 +92,17 @@ public class AdminHeal implements IAdminCommandHandler
{
int radius = Integer.parseInt(player);
Collection<L2Object> objs = activeChar.getKnownList().getKnownObjects().values();
//synchronized (activeChar.getKnownList().getKnownObjects())
for (L2Object object : objs)
{
for (L2Object object : objs)
if (object instanceof L2Character)
{
if (object instanceof L2Character)
{
L2Character character = (L2Character) object;
character.setCurrentHpMp(character.getMaxHp(), character.getMaxMp());
if (object instanceof L2PcInstance)
character.setCurrentCp(character.getMaxCp());
}
L2Character character = (L2Character) object;
character.setCurrentHpMp(character.getMaxHp(), character.getMaxMp());
if (object instanceof L2PcInstance)
character.setCurrentCp(character.getMaxCp());
}
}
activeChar.sendMessage("Healed within " + radius + " unit radius.");
return;
}
......
L2J_DataPack_BETA/data/scripts/handlers/chathandlers/ChatAll.java
+ 5
− 6
View file @ 40fd9061
......@@ -48,6 +48,7 @@ public class ChatAll implements IChatHandler
* Handle chat type 'all'
* @see com.l2jserver.gameserver.handler.IChatHandler#handleChat(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
*/
@Override
public void handleChat(int type, L2PcInstance activeChar, String params, String text)
{
boolean vcd_used = false;
......@@ -100,13 +101,10 @@ public class ChatAll implements IChatHandler
{
CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getAppearance().getVisibleName(), text);
Collection<L2PcInstance> plrs = activeChar.getKnownList().getKnownPlayers().values();
//synchronized (activeChar.getKnownList().getKnownPlayers())
for (L2PcInstance player : plrs)
{
for (L2PcInstance player : plrs)
{
if (player != null && activeChar.isInsideRadius(player, 1250, false, true) && !BlockList.isBlocked(player, activeChar))
player.sendPacket(cs);
}
if (player != null && activeChar.isInsideRadius(player, 1250, false, true) && !BlockList.isBlocked(player, activeChar))
player.sendPacket(cs);
}
activeChar.sendPacket(cs);
......@@ -118,6 +116,7 @@ public class ChatAll implements IChatHandler
* Returns the chat types registered to this handler
* @see com.l2jserver.gameserver.handler.IChatHandler#getChatTypeList()
*/
@Override
public int[] getChatTypeList()
{
return COMMAND_IDS;
......
L2J_DataPack_BETA/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
+ 4
− 4
View file @ 40fd9061
......@@ -14,17 +14,15 @@
*/
package handlers.itemhandlers;
import javolution.util.FastMap;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.handler.IItemHandler;
import com.l2jserver.gameserver.model.L2ItemInstance;
import com.l2jserver.gameserver.model.L2Skill;
import com.l2jserver.gameserver.model.actor.L2Playable;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance.TimeStamp;
import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance;
import com.l2jserver.gameserver.model.entity.TvTEvent;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
......@@ -32,6 +30,7 @@ import com.l2jserver.gameserver.network.serverpackets.ExUseSharedGroupItem;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.skills.SkillHolder;
import com.l2jserver.gameserver.templates.item.L2EtcItemType;
import com.l2jserver.gameserver.util.L2TIntObjectHashMap;
/**
* Template for item skills handler
......@@ -43,6 +42,7 @@ public class ItemSkillsTemplate implements IItemHandler
*
* @see com.l2jserver.gameserver.handler.IItemHandler#useItem(com.l2jserver.gameserver.model.actor.L2Playable, com.l2jserver.gameserver.model.L2ItemInstance, boolean)
*/
@Override
public void useItem(L2Playable playable, L2ItemInstance item, boolean forceUse)
{
L2PcInstance activeChar;
......@@ -188,7 +188,7 @@ public class ItemSkillsTemplate implements IItemHandler
private void reuse(L2PcInstance player,L2Skill skill, L2ItemInstance item)
{
SystemMessage sm = null;
final FastMap<Integer, TimeStamp> timeStamp = player.getReuseTimeStamp();
final L2TIntObjectHashMap<TimeStamp> timeStamp = player.getReuseTimeStamp();
if (timeStamp != null && timeStamp.containsKey(skill.getReuseHashCode()))
{
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment