rendered paste bodyIndex: D:/eclipse/workspace/L2J_C4_Server/java/net/sf/l2j/gameserver/handler/itemhandlers/CrystalCarol.java
===================================================================
--- D:/eclipse/workspace/L2J_C4_Server/java/net/sf/l2j/gameserver/handler/itemhandlers/CrystalCarol.java (revision 2181)
+++ D:/eclipse/workspace/L2J_C4_Server/java/net/sf/l2j/gameserver/handler/itemhandlers/CrystalCarol.java (working copy)
@@ -33,7 +33,7 @@
public class CrystalCarol implements IItemHandler
{
private static int[] _itemIds = { 5562, 5563, 5564, 5565, 5566, 5583, 5584, 5585, 5586, 5587
- ,4411, 4412, 4413, 4414, 4415, 4416, 4417, 5010};
+ ,4411, 4412, 4413, 4414, 4415, 4416, 4417, 5010, 7061, 7062};
public void useItem(L2PlayableInstance playable, L2ItemInstance item)
{
@@ -131,6 +131,16 @@
activeChar.broadcastPacket(MSU);
//playCrystalSound(activeChar,"SkillSound2.crystal_victory");
}
+ else if (itemId == 7061) { //crystal_birthday
+ MagicSkillUser MSU = new MagicSkillUser(playable, activeChar, 2187, 1, 1, 0);
+ activeChar.broadcastPacket(MSU);
+ //playCrystalSound(activeChar,"SkillSound2._crystal_birthday");
+ }
+ else if (itemId == 7062) { //crystal_wedding
+ MagicSkillUser MSU = new MagicSkillUser(playable, activeChar, 2230, 1, 1, 0);
+ activeChar.broadcastPacket(MSU);
+ //playCrystalSound(activeChar,"SkillSound2.crystal_wedding");
+ }
activeChar.destroyItem("Consume", item.getObjectId(), 1, null, false);
}
Index: D:/eclipse/workspace/L2J_C4_Server/java/net/sf/l2j/gameserver/clientpackets/EnterWorld.java
===================================================================
--- D:/eclipse/workspace/L2J_C4_Server/java/net/sf/l2j/gameserver/clientpackets/EnterWorld.java (revision 2181)
+++ D:/eclipse/workspace/L2J_C4_Server/java/net/sf/l2j/gameserver/clientpackets/EnterWorld.java (working copy)
@@ -180,7 +180,7 @@
SystemMessage sm = new SystemMessage(34);
sendPacket(sm);
- sm = new SystemMessage(SystemMessage.S1_S2);
+ /*sm = new SystemMessage(SystemMessage.S1_S2);
sm.addString(getText("VGhpcyBTZXJ2ZXIgaXMgcnVubmluZyBMMko="));
sm.addString(getText("IHZlcnNpb24gNiBkZXYvdW5zdGFibGU="));
sendPacket(sm);
@@ -206,7 +206,7 @@
sm.addString(getText("TDJKIFNlcnZlciBCdWlsZCBEYXRlOg==")+" "+Config.SERVER_BUILD_DATE);
sendPacket(sm);
}
-
+ */
SevenSigns.getInstance().sendCurrentPeriodMsg(activeChar);
Announcements.getInstance().showAnnouncements(activeChar);
Index: D:/eclipse/workspace/L2J_C4_Server/java/net/sf/l2j/gameserver/clientpackets/MoveBackwardToLocation.java
===================================================================
--- D:/eclipse/workspace/L2J_C4_Server/java/net/sf/l2j/gameserver/clientpackets/MoveBackwardToLocation.java (revision 2181)
+++ D:/eclipse/workspace/L2J_C4_Server/java/net/sf/l2j/gameserver/clientpackets/MoveBackwardToLocation.java (working copy)
@@ -106,7 +106,7 @@
return;
}
- if (_moveMovement == 0) // activeChar.isCastingNow() || cursor movement is temporary disabled
+ if (activeChar.isCastingNow())
{
activeChar.sendPacket(new ActionFailed());
}
Index: D:/eclipse/workspace/L2J_C4_Server/java/net/sf/l2j/gameserver/model/actor/instance/L2MonsterInstance.java
===================================================================
--- D:/eclipse/workspace/L2J_C4_Server/java/net/sf/l2j/gameserver/model/actor/instance/L2MonsterInstance.java (revision 2181)
+++ D:/eclipse/workspace/L2J_C4_Server/java/net/sf/l2j/gameserver/model/actor/instance/L2MonsterInstance.java (working copy)
@@ -24,6 +24,8 @@
import net.sf.l2j.gameserver.ThreadPoolManager;
import net.sf.l2j.gameserver.lib.Rnd;
+import net.sf.l2j.gameserver.serverpackets.SocialAction;
+import net.sf.l2j.gameserver.serverpackets.Earthquake;
import net.sf.l2j.gameserver.model.L2Attackable;
import net.sf.l2j.gameserver.model.L2Character;
import net.sf.l2j.gameserver.model.actor.knownlist.MonsterKnownList;
@@ -127,6 +129,30 @@
catch ( NullPointerException e )
{
}
+ switch (getTemplate().npcId)
+ {
+ case 12372://Baium
+ {
+ Earthquake eq = new Earthquake(this.getX(),this.getY(),this.getZ(),30,10);
+ broadcastPacket(eq);
+ SocialAction sa = new SocialAction(getObjectId(),2);
+ broadcastPacket(sa);
+ return;
+ }
+ case 12899://Valakas
+ {
+ SocialAction sa = new SocialAction(getObjectId(),3);
+ broadcastPacket(sa);
+ return;
+ }
+ case 12211://Antharas
+ {
+ SocialAction sa = new SocialAction(getObjectId(),3);
+ broadcastPacket(sa);
+ return;
+ }
+
+ }
}
protected int getMaintenanceInterval() { return MONSTER_MAINTENANCE_INTERVAL; }
Index: D:/eclipse/workspace/L2J_C4_Server/java/net/sf/l2j/gameserver/taskmanager/DecayTaskManager.java
===================================================================
--- D:/eclipse/workspace/L2J_C4_Server/java/net/sf/l2j/gameserver/taskmanager/DecayTaskManager.java (revision 2181)
+++ D:/eclipse/workspace/L2J_C4_Server/java/net/sf/l2j/gameserver/taskmanager/DecayTaskManager.java (working copy)
@@ -60,7 +60,7 @@
if (_decayTasks != null)
for(L2Character actor : _decayTasks.keySet())
{
- if((current - _decayTasks.get(actor)) > 8500)
+ if((current - _decayTasks.get(actor)) > 10000)
{
actor.onDecay();
_decayTasks.remove(actor);
Index: D:/eclipse/workspace/L2J_C4_Server/java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminTeleport.java
===================================================================
--- D:/eclipse/workspace/L2J_C4_Server/java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminTeleport.java (revision 2184)
+++ D:/eclipse/workspace/L2J_C4_Server/java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminTeleport.java (working copy)
@@ -77,6 +77,7 @@
"admin_godown",
"admin_tele",
"admin_teleto",
+ "admin_teleport",
"admin_failed"
};
private static final int REQUIRED_LEVEL = Config.GM_TELEPORT;
@@ -146,7 +147,7 @@
if (Config.DEBUG) _log.info("admin_walk: "+e);
}
}
- else if (command.startsWith("admin_move_to"))
+ else if ((command.startsWith("admin_move_to")) || (command.startsWith("admin_teleport ")))
{
try
{