Sync with L2JServer Jan 30th 2015.

2015-01-31 03:47:34 +00:00
parent acf0c17ba4
commit e7005fbedd
148 changed files with 1922 additions and 1672 deletions
--- a/trunk/java/com/l2jserver/gameserver/enums/InstanceType.java
+++ b/trunk/java/com/l2jserver/gameserver/enums/InstanceType.java
@@ -35,6 +35,7 @@ public enum InstanceType
 	L2DoorInstance(L2Character),
 	L2TerrainObjectInstance(L2Npc),
 	L2EffectPointInstance(L2Npc),
+	CommissionManagerInstance(L2Npc),
 	// Summons, Pets, Decoys and Traps
 	L2ServitorInstance(L2Summon),
 	L2PetInstance(L2Summon),
--- a/trunk/java/com/l2jserver/gameserver/enums/ItemLocation.java
+++ b/trunk/java/com/l2jserver/gameserver/enums/ItemLocation.java
@@ -31,5 +31,5 @@ public enum ItemLocation
 	REFUND,
 	MAIL,
 	FREIGHT,
-	AUCTION
+	AUCTION_HOUSE
 }