API tools faq
paste
Advertisement
Nik

Instances reenter fix

Nik
Apr 21st, 2011
184
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 6.20 KB | None | 0 0
raw download clone embed print report
  1. Index: data/scripts/instances/CrystalCaverns/CrystalCaverns.java
  2. ===================================================================
  3. --- data/scripts/instances/CrystalCaverns/CrystalCaverns.java   (revision 7916)
  4. +++ data/scripts/instances/CrystalCaverns/CrystalCaverns.java   (working copy)
  5. @@ -91,11 +91,11 @@
  6.         public           List<L2Npc> guards                               = new FastList<L2Npc>();
  7.         public           List<L2Npc> oracle                               = new FastList<L2Npc>();
  8.         // baylor variables
  9. -       private List<L2PcInstance> _raiders = new FastList<L2PcInstance>();
  10. +       private final List<L2PcInstance> _raiders = new FastList<L2PcInstance>();
  11.         private int _raidStatus = 0;
  12.         private long _dragonClawStart = 0;
  13.         private int _dragonClawNeed = 0;
  14. -       private List<L2Npc> _animationMobs = new FastList<L2Npc>();
  15. +       private final List<L2Npc> _animationMobs = new FastList<L2Npc>();
  16.         private L2Npc _camera = null;
  17.         private L2Npc _baylor = null;
  18.         private L2Npc _alarm = null;
  19. @@ -521,9 +521,16 @@
  20.                 player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER));
  21.                 return 0;
  22.             }
  23. -           teleto.instanceId = world.instanceId;
  24. -           teleportplayer(player,teleto);
  25. -           return world.instanceId;
  26. +           else if (player.getLevel() >= 78)
  27. +           {
  28. +               teleto.instanceId = world.instanceId;
  29. +               teleportplayer(player,teleto);
  30. +               return world.instanceId;
  31. +           }
  32. +           SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_LEVEL_REQUIREMENT_NOT_SUFFICIENT);
  33. +           sm.addPcName(player);
  34. +           player.sendPacket(sm);
  35. +           return 0;
  36.         }
  37.         //New instance
  38.         else
  39. Index: data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
  40. ===================================================================
  41. --- data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java   (revision 7916)
  42. +++ data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java   (working copy)
  43. @@ -272,9 +272,16 @@
  44.                 player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER));
  45.                 return 0;
  46.             }
  47. -           teleto.instanceId = world.instanceId;
  48. -           teleportplayer(player,teleto);
  49. -           return instanceId;
  50. +           else if (player.getLevel() >= 78)
  51. +           {
  52. +               teleto.instanceId = world.instanceId;
  53. +               teleportplayer(player,teleto);
  54. +               return world.instanceId;
  55. +           }
  56. +           SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_LEVEL_REQUIREMENT_NOT_SUFFICIENT);
  57. +           sm.addPcName(player);
  58. +           player.sendPacket(sm);
  59. +           return 0;
  60.         }
  61.         //New instance
  62.         else
  63. Index: data/scripts/instances/SeedOfDestruction/Stage1.java
  64. ===================================================================
  65. --- data/scripts/instances/SeedOfDestruction/Stage1.java    (revision 7916)
  66. +++ data/scripts/instances/SeedOfDestruction/Stage1.java    (working copy)
  67. @@ -26,13 +26,13 @@
  68.  
  69.  import javax.xml.parsers.DocumentBuilderFactory;
  70.  
  71. +import javolution.util.FastList;
  72. +import javolution.util.FastMap;
  73. +
  74.  import org.w3c.dom.Document;
  75.  import org.w3c.dom.NamedNodeMap;
  76.  import org.w3c.dom.Node;
  77.  
  78. -import javolution.util.FastList;
  79. -import javolution.util.FastMap;
  80. -
  81.  import com.l2jserver.Config;
  82.  import com.l2jserver.gameserver.GeoData;
  83.  import com.l2jserver.gameserver.ai.CtrlIntention;
  84. @@ -41,11 +41,11 @@
  85.  import com.l2jserver.gameserver.instancemanager.InstanceManager.InstanceWorld;
  86.  import com.l2jserver.gameserver.model.L2CharPosition;
  87.  import com.l2jserver.gameserver.model.L2CommandChannel;
  88. +import com.l2jserver.gameserver.model.L2Object.InstanceType;
  89.  import com.l2jserver.gameserver.model.L2Party;
  90.  import com.l2jserver.gameserver.model.L2Skill;
  91.  import com.l2jserver.gameserver.model.L2Territory;
  92.  import com.l2jserver.gameserver.model.L2World;
  93. -import com.l2jserver.gameserver.model.L2Object.InstanceType;
  94.  import com.l2jserver.gameserver.model.actor.L2Attackable;
  95.  import com.l2jserver.gameserver.model.actor.L2Character;
  96.  import com.l2jserver.gameserver.model.actor.L2Npc;
  97. @@ -104,9 +104,9 @@
  98.     private static final int MAX_DEVICESPAWNEDMOBCOUNT = 100; // prevent too much mob spawn
  99.     private static final boolean debug = false;
  100.    
  101. -   private TIntObjectHashMap<L2Territory> _spawnZoneList = new TIntObjectHashMap<L2Territory>();
  102. -   private TIntObjectHashMap<List<SODSpawn>> _spawnList = new TIntObjectHashMap<List<SODSpawn>>();
  103. -   private List<Integer> _mustKillMobsId = new FastList<Integer>();
  104. +   private final TIntObjectHashMap<L2Territory> _spawnZoneList = new TIntObjectHashMap<L2Territory>();
  105. +   private final TIntObjectHashMap<List<SODSpawn>> _spawnList = new TIntObjectHashMap<List<SODSpawn>>();
  106. +   private final List<Integer> _mustKillMobsId = new FastList<Integer>();
  107.  
  108.     // teleports
  109.     private static final int[] ENTER_TELEPORT_1 = {-242759,219981,-9986};
  110. @@ -428,8 +428,15 @@
  111.                 player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER));
  112.                 return 0;
  113.             }
  114. -           teleportPlayer(player, coords, world.instanceId);
  115. -           return world.instanceId;
  116. +           else if (player.getLevel() >= 75)
  117. +           {
  118. +               teleportPlayer(player, coords, world.instanceId);
  119. +               return world.instanceId;
  120. +           }
  121. +           SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_LEVEL_REQUIREMENT_NOT_SUFFICIENT);
  122. +           sm.addPcName(player);
  123. +           player.sendPacket(sm);
  124. +           return 0;
  125.         }
  126.         //New instance
  127.         else
  128. Index: data/scripts/instances/SeedOfInfinity/HallOfSuffering.java
  129. ===================================================================
  130. --- data/scripts/instances/SeedOfInfinity/HallOfSuffering.java  (revision 7916)
  131. +++ data/scripts/instances/SeedOfInfinity/HallOfSuffering.java  (working copy)
  132. @@ -194,8 +194,15 @@
  133.                 player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER));
  134.                 return 0;
  135.             }
  136. -           teleportPlayer(player, coords, world.instanceId);
  137. -           return world.instanceId;
  138. +           else if (player.getLevel() >= 75)
  139. +           {
  140. +               teleportPlayer(player, coords, world.instanceId);
  141. +               return world.instanceId;
  142. +           }
  143. +           SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_LEVEL_REQUIREMENT_NOT_SUFFICIENT);
  144. +           sm.addPcName(player);
  145. +           player.sendPacket(sm);
  146. +           return 0;
  147.         }
  148.         //New instance
  149.         else
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!