2
0
Эх сурвалжийг харах

An option to start server with defined doors open. Thanks GodKratos.
Example: http://www.l2jserver.com/forum/thread.php?postid=187172
Also some import cleaning.

Sami 16 жил өмнө
parent
commit
8f61b7bae9

+ 5 - 3
L2_GameServer/java/net/sf/l2j/gameserver/datatables/DoorTable.java

@@ -140,9 +140,11 @@ public class DoorTable
 		int pdef = Integer.parseInt(st.nextToken());
 		int mdef = Integer.parseInt(st.nextToken());
 		boolean unlockable = false;
-		
 		if (st.hasMoreTokens())
 			unlockable = Boolean.parseBoolean(st.nextToken());
+		boolean startOpen = false;
+		if (st.hasMoreTokens())
+			startOpen = Boolean.parseBoolean(st.nextToken());
 		
 		if (rangeXMin > rangeXMax)
 			_log.severe("Error in door data, ID:" + id);
@@ -213,7 +215,7 @@ public class DoorTable
 			_log.severe("Error in door data, ID:" + id);
 		}
 		door.setCurrentHpMp(door.getMaxHp(), door.getMaxMp());
-		door.setOpen(1);
+		door.setOpen(startOpen);
 		door.setXYZInvisible(x, y, z);
 		
 		return door;
@@ -314,7 +316,7 @@ public class DoorTable
 					// phase 3, basically only z remains but now we calculate it with another formula (by rage)
 					// in some cases the direct line check (only) in the beginning isn't sufficient, 
 					// when char z changes a lot along the path
-					if (doorInst.getCurrentHp() > 0 && doorInst.getOpen() != 0) 
+					if (doorInst.getCurrentHp() > 0 && !doorInst.getOpen()) 
 					{
 						int px1 = doorInst.getXMin();
 						int py1 = doorInst.getYMin();

+ 1 - 55
L2_GameServer/java/net/sf/l2j/gameserver/handler/AdminCommandHandler.java

@@ -19,61 +19,7 @@ import java.util.logging.Logger;
 
 import javolution.util.FastMap;
 import net.sf.l2j.Config;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminAdmin;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminAnnouncements;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminBBS;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminBan;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminBanChat;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminCache;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminChangeAccessLevel;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminCreateItem;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminCursedWeapons;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminDelete;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminDoorControl;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminEditChar;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminEditNpc;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminEffects;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminEnchant;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminEventEngine;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminExpSp;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminFightCalculator;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminFortSiege;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminGeoEditor;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminGeodata;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminGm;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminGmChat;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminHeal;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminHelpPage;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminInvul;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminKick;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminKill;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminLevel;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminLogin;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminMammon;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminManor;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminMenu;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminMobGroup;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminMonsterRace;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminPForge;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminPathNode;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminPetition;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminPledge;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminPolymorph;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminQuest;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminRepairChar;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminRes;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminRide;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminShop;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminShutdown;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminSiege;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminSkill;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminSpawn;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminTarget;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminTeleport;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminTest;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminTvTEvent;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminUnblockIp;
-import net.sf.l2j.gameserver.handler.admincommandhandlers.AdminZone;
+import net.sf.l2j.gameserver.handler.admincommandhandlers.*;
 
 /**
  * This class ...

+ 1 - 11
L2_GameServer/java/net/sf/l2j/gameserver/handler/ChatHandler.java

@@ -18,17 +18,7 @@ import java.util.logging.Logger;
 
 import javolution.util.FastMap;
 import net.sf.l2j.Config;
-import net.sf.l2j.gameserver.handler.chathandlers.ChatAll;
-import net.sf.l2j.gameserver.handler.chathandlers.ChatAlliance;
-import net.sf.l2j.gameserver.handler.chathandlers.ChatClan;
-import net.sf.l2j.gameserver.handler.chathandlers.ChatHeroVoice;
-import net.sf.l2j.gameserver.handler.chathandlers.ChatParty;
-import net.sf.l2j.gameserver.handler.chathandlers.ChatPartyRoomAll;
-import net.sf.l2j.gameserver.handler.chathandlers.ChatPartyRoomCommander;
-import net.sf.l2j.gameserver.handler.chathandlers.ChatPetition;
-import net.sf.l2j.gameserver.handler.chathandlers.ChatShout;
-import net.sf.l2j.gameserver.handler.chathandlers.ChatTell;
-import net.sf.l2j.gameserver.handler.chathandlers.ChatTrade;
+import net.sf.l2j.gameserver.handler.chathandlers.*;
 
 /**
  * This class handles all chat handlers

+ 1 - 33
L2_GameServer/java/net/sf/l2j/gameserver/handler/ItemHandler.java

@@ -18,39 +18,7 @@ import java.util.Map;
 import java.util.TreeMap;
 import java.util.logging.Logger;
 
-import net.sf.l2j.gameserver.handler.itemhandlers.BeastSoulShot;
-import net.sf.l2j.gameserver.handler.itemhandlers.BeastSpice;
-import net.sf.l2j.gameserver.handler.itemhandlers.BeastSpiritShot;
-import net.sf.l2j.gameserver.handler.itemhandlers.BlessedSpiritShot;
-import net.sf.l2j.gameserver.handler.itemhandlers.Book;
-import net.sf.l2j.gameserver.handler.itemhandlers.CharChangePotions;
-import net.sf.l2j.gameserver.handler.itemhandlers.CrystalCarol;
-import net.sf.l2j.gameserver.handler.itemhandlers.EnchantAttribute;
-import net.sf.l2j.gameserver.handler.itemhandlers.EnchantScrolls;
-import net.sf.l2j.gameserver.handler.itemhandlers.EnergyStone;
-import net.sf.l2j.gameserver.handler.itemhandlers.ExtractableItems;
-import net.sf.l2j.gameserver.handler.itemhandlers.Firework;
-import net.sf.l2j.gameserver.handler.itemhandlers.FishShots;
-import net.sf.l2j.gameserver.handler.itemhandlers.Harvester;
-import net.sf.l2j.gameserver.handler.itemhandlers.Key;
-import net.sf.l2j.gameserver.handler.itemhandlers.Maps;
-import net.sf.l2j.gameserver.handler.itemhandlers.MercTicket;
-import net.sf.l2j.gameserver.handler.itemhandlers.MysteryPotion;
-import net.sf.l2j.gameserver.handler.itemhandlers.PaganKeys;
-import net.sf.l2j.gameserver.handler.itemhandlers.Potions;
-import net.sf.l2j.gameserver.handler.itemhandlers.Recipes;
-import net.sf.l2j.gameserver.handler.itemhandlers.Remedy;
-import net.sf.l2j.gameserver.handler.itemhandlers.RollingDice;
-import net.sf.l2j.gameserver.handler.itemhandlers.ScrollOfEscape;
-import net.sf.l2j.gameserver.handler.itemhandlers.ScrollOfResurrection;
-import net.sf.l2j.gameserver.handler.itemhandlers.Scrolls;
-import net.sf.l2j.gameserver.handler.itemhandlers.Seed;
-import net.sf.l2j.gameserver.handler.itemhandlers.SevenSignsRecord;
-import net.sf.l2j.gameserver.handler.itemhandlers.SoulCrystals;
-import net.sf.l2j.gameserver.handler.itemhandlers.SoulShots;
-import net.sf.l2j.gameserver.handler.itemhandlers.SpecialXMas;
-import net.sf.l2j.gameserver.handler.itemhandlers.SpiritShot;
-import net.sf.l2j.gameserver.handler.itemhandlers.SummonItems;
+import net.sf.l2j.gameserver.handler.itemhandlers.*;
 
 /**
  * This class manages handlers of items

+ 1 - 37
L2_GameServer/java/net/sf/l2j/gameserver/handler/SkillHandler.java

@@ -18,43 +18,7 @@ import java.util.Map;
 import java.util.TreeMap;
 import java.util.logging.Logger;
 
-import net.sf.l2j.gameserver.handler.skillhandlers.BalanceLife;
-import net.sf.l2j.gameserver.handler.skillhandlers.BeastFeed;
-import net.sf.l2j.gameserver.handler.skillhandlers.Blow;
-import net.sf.l2j.gameserver.handler.skillhandlers.Charge;
-import net.sf.l2j.gameserver.handler.skillhandlers.CombatPointHeal;
-import net.sf.l2j.gameserver.handler.skillhandlers.Continuous;
-import net.sf.l2j.gameserver.handler.skillhandlers.CpDam;
-import net.sf.l2j.gameserver.handler.skillhandlers.Craft;
-import net.sf.l2j.gameserver.handler.skillhandlers.DeluxeKey;
-import net.sf.l2j.gameserver.handler.skillhandlers.Disablers;
-import net.sf.l2j.gameserver.handler.skillhandlers.DrainSoul;
-import net.sf.l2j.gameserver.handler.skillhandlers.Fishing;
-import net.sf.l2j.gameserver.handler.skillhandlers.FishingSkill;
-import net.sf.l2j.gameserver.handler.skillhandlers.GetPlayer;
-import net.sf.l2j.gameserver.handler.skillhandlers.GiveSp;
-import net.sf.l2j.gameserver.handler.skillhandlers.Harvest;
-import net.sf.l2j.gameserver.handler.skillhandlers.Heal;
-import net.sf.l2j.gameserver.handler.skillhandlers.ManaHeal;
-import net.sf.l2j.gameserver.handler.skillhandlers.Manadam;
-import net.sf.l2j.gameserver.handler.skillhandlers.Mdam;
-import net.sf.l2j.gameserver.handler.skillhandlers.Pdam;
-import net.sf.l2j.gameserver.handler.skillhandlers.Recall;
-import net.sf.l2j.gameserver.handler.skillhandlers.Resurrect;
-import net.sf.l2j.gameserver.handler.skillhandlers.ShiftTarget;
-import net.sf.l2j.gameserver.handler.skillhandlers.SiegeFlag;
-import net.sf.l2j.gameserver.handler.skillhandlers.Soul;
-import net.sf.l2j.gameserver.handler.skillhandlers.Sow;
-import net.sf.l2j.gameserver.handler.skillhandlers.Spoil;
-import net.sf.l2j.gameserver.handler.skillhandlers.StrSiegeAssault;
-import net.sf.l2j.gameserver.handler.skillhandlers.SummonFriend;
-import net.sf.l2j.gameserver.handler.skillhandlers.SummonTreasureKey;
-import net.sf.l2j.gameserver.handler.skillhandlers.Sweep;
-import net.sf.l2j.gameserver.handler.skillhandlers.TakeCastle;
-import net.sf.l2j.gameserver.handler.skillhandlers.TakeFort;
-import net.sf.l2j.gameserver.handler.skillhandlers.TransformDispel;
-import net.sf.l2j.gameserver.handler.skillhandlers.Trap;
-import net.sf.l2j.gameserver.handler.skillhandlers.Unlock;
+import net.sf.l2j.gameserver.handler.skillhandlers.*;
 import net.sf.l2j.gameserver.templates.L2SkillType;
 
 /**

+ 1 - 13
L2_GameServer/java/net/sf/l2j/gameserver/handler/UserCommandHandler.java

@@ -19,19 +19,7 @@ import java.util.logging.Logger;
 
 import javolution.util.FastMap;
 import net.sf.l2j.Config;
-import net.sf.l2j.gameserver.handler.usercommandhandlers.ChannelDelete;
-import net.sf.l2j.gameserver.handler.usercommandhandlers.ChannelLeave;
-import net.sf.l2j.gameserver.handler.usercommandhandlers.ChannelListUpdate;
-import net.sf.l2j.gameserver.handler.usercommandhandlers.ClanPenalty;
-import net.sf.l2j.gameserver.handler.usercommandhandlers.ClanWarsList;
-import net.sf.l2j.gameserver.handler.usercommandhandlers.DisMount;
-import net.sf.l2j.gameserver.handler.usercommandhandlers.Escape;
-import net.sf.l2j.gameserver.handler.usercommandhandlers.InstanceZone;
-import net.sf.l2j.gameserver.handler.usercommandhandlers.Loc;
-import net.sf.l2j.gameserver.handler.usercommandhandlers.Mount;
-import net.sf.l2j.gameserver.handler.usercommandhandlers.OlympiadStat;
-import net.sf.l2j.gameserver.handler.usercommandhandlers.PartyInfo;
-import net.sf.l2j.gameserver.handler.usercommandhandlers.Time;
+import net.sf.l2j.gameserver.handler.usercommandhandlers.*;
 
 /**
  * This class ...

+ 1 - 3
L2_GameServer/java/net/sf/l2j/gameserver/handler/VoicedCommandHandler.java

@@ -19,9 +19,7 @@ import java.util.logging.Logger;
 
 import javolution.util.FastMap;
 import net.sf.l2j.Config;
-import net.sf.l2j.gameserver.handler.voicedcommandhandlers.Banking;
-import net.sf.l2j.gameserver.handler.voicedcommandhandlers.Wedding;
-import net.sf.l2j.gameserver.handler.voicedcommandhandlers.stats;
+import net.sf.l2j.gameserver.handler.voicedcommandhandlers.*;
 
 /**
  * This class ...

+ 1 - 1
L2_GameServer/java/net/sf/l2j/gameserver/handler/skillhandlers/Unlock.java

@@ -62,7 +62,7 @@ public class Unlock implements ISkillHandler
 					return;
 				}
 				
-				if (success && (door.getOpen() == 1))
+				if (success && (!door.getOpen()))
 				{
 					door.openMe();
 					door.onOpen();

+ 2 - 22
L2_GameServer/java/net/sf/l2j/gameserver/instancemanager/ZoneManager.java

@@ -29,28 +29,8 @@ import net.sf.l2j.L2DatabaseFactory;
 import net.sf.l2j.gameserver.model.L2World;
 import net.sf.l2j.gameserver.model.L2WorldRegion;
 import net.sf.l2j.gameserver.model.zone.L2ZoneType;
-import net.sf.l2j.gameserver.model.zone.form.ZoneCuboid;
-import net.sf.l2j.gameserver.model.zone.form.ZoneCylinder;
-import net.sf.l2j.gameserver.model.zone.form.ZoneNPoly;
-import net.sf.l2j.gameserver.model.zone.type.L2ArenaZone;
-import net.sf.l2j.gameserver.model.zone.type.L2BigheadZone;
-import net.sf.l2j.gameserver.model.zone.type.L2BossZone;
-import net.sf.l2j.gameserver.model.zone.type.L2CastleTeleportZone;
-import net.sf.l2j.gameserver.model.zone.type.L2CastleZone;
-import net.sf.l2j.gameserver.model.zone.type.L2ClanHallZone;
-import net.sf.l2j.gameserver.model.zone.type.L2DamageZone;
-import net.sf.l2j.gameserver.model.zone.type.L2DerbyTrackZone;
-import net.sf.l2j.gameserver.model.zone.type.L2FishingZone;
-import net.sf.l2j.gameserver.model.zone.type.L2FortZone;
-import net.sf.l2j.gameserver.model.zone.type.L2JailZone;
-import net.sf.l2j.gameserver.model.zone.type.L2MotherTreeZone;
-import net.sf.l2j.gameserver.model.zone.type.L2NoLandingZone;
-import net.sf.l2j.gameserver.model.zone.type.L2OlympiadStadiumZone;
-import net.sf.l2j.gameserver.model.zone.type.L2PeaceZone;
-import net.sf.l2j.gameserver.model.zone.type.L2PoisonZone;
-import net.sf.l2j.gameserver.model.zone.type.L2SwampZone;
-import net.sf.l2j.gameserver.model.zone.type.L2TownZone;
-import net.sf.l2j.gameserver.model.zone.type.L2WaterZone;
+import net.sf.l2j.gameserver.model.zone.form.*;
+import net.sf.l2j.gameserver.model.zone.type.*;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;

+ 8 - 8
L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2DoorInstance.java

@@ -81,7 +81,7 @@ public class L2DoorInstance extends L2Character
 
     protected final int _doorId;
     protected final String _name;
-    private int _open;
+    private boolean _open;
     private boolean _unlockable;
 
     private ClanHall _clanHall;
@@ -148,7 +148,7 @@ public class L2DoorInstance extends L2Character
             try {
                 String doorAction;
 
-                if (getOpen() == 1) {
+                if (!getOpen()) {
                     doorAction = "opened";
                     openMe();
                 }
@@ -225,14 +225,14 @@ public class L2DoorInstance extends L2Character
     /**
      * @return Returns the open.
      */
-    public int getOpen()
+    public boolean getOpen()
     {
         return _open;
     }
     /**
      * @param open The open to set.
      */
-    public void setOpen(int open)
+    public void setOpen(boolean open)
     {
         _open = open;
     }
@@ -435,7 +435,7 @@ public class L2DoorInstance extends L2Character
                 else
                 {
                 	player.gatesRequest(this);
-                    if (getOpen() == 1)
+                    if (!getOpen())
                     {
                     	player.sendPacket(new ConfirmDlg(1140));
                     }
@@ -454,7 +454,7 @@ public class L2DoorInstance extends L2Character
                 else
                 {
                 	player.gatesRequest(this);
-                    if (getOpen() == 1)
+                    if (!getOpen())
                     {
                     	player.sendPacket(new ConfirmDlg(1140));
                     }
@@ -563,13 +563,13 @@ public class L2DoorInstance extends L2Character
 
     public final void closeMe()
     {
-        setOpen(1);
+        setOpen(false);
         broadcastStatusUpdate();
     }
 
     public final void openMe()
     {
-        setOpen(0);
+        setOpen(true);
         broadcastStatusUpdate();
     }
 

+ 1 - 1
L2_GameServer/java/net/sf/l2j/gameserver/model/entity/Castle.java

@@ -621,7 +621,7 @@ public class Castle
 				door.spawnMe(door.getX(), door.getY(), door.getZ());
 				getDoors().set(i, door);
 			}
-			else if (door.getOpen() == 0)
+			else if (door.getOpen())
 				door.closeMe();
 		}
 		loadDoorUpgrade(); // Check for any upgrade the doors may have

+ 1 - 1
L2_GameServer/java/net/sf/l2j/gameserver/model/entity/ClanHall.java

@@ -407,7 +407,7 @@ public class ClanHall
 				door.spawnMe(door.getX(), door.getY(), door.getZ());
 				getDoors().set(i, door);
 			}
-			else if (door.getOpen() == 0)
+			else if (door.getOpen())
 				door.closeMe();
 		}
 	}

+ 1 - 1
L2_GameServer/java/net/sf/l2j/gameserver/model/entity/Fort.java

@@ -267,7 +267,7 @@ public class Fort
 				door.spawnMe(door.getX(), door.getY(), door.getZ());
 				getDoors().set(i, door);
 			}
-			else if (door.getOpen() == 0)
+			else if (door.getOpen())
 				door.closeMe();
 		}
 		loadDoorUpgrade(); // Check for any upgrade the doors may have

+ 1 - 1
L2_GameServer/java/net/sf/l2j/gameserver/network/serverpackets/DoorStatusUpdate.java

@@ -44,7 +44,7 @@ public final class DoorStatusUpdate extends L2GameServerPacket
 	{
 		writeC(0x4d);
 		writeD(_door.getObjectId());
-		writeD(_door.getOpen());
+		writeD(_door.getOpen() ? 0 : 1);
 		writeD(_door.getDamage());
 		writeD(_door.isEnemy() ? 1 : 0);
 		writeD(_door.getDoorId());

+ 1 - 1
L2_GameServer/java/net/sf/l2j/gameserver/network/serverpackets/StaticObject.java

@@ -58,7 +58,7 @@ public class StaticObject extends L2GameServerPacket
         _type = 1;
         _isTargetable = true;
         _meshIndex = 1;
-        _isClosed = door.getOpen() == 1;
+        _isClosed = !door.getOpen();
         _isEnemy = door.isEnemy();
         _maxHp = door.getMaxHp();
         _currentHp = (int) door.getCurrentHp();