- party member position fix, thx denser

- other little corrections
- another java code settings

L2_GameServer/.settings/org.eclipse.jdt.core.prefs

@@ -1,5 +1,15 @@
-#Sat Jan 09 21:52:16 CET 2010
+#Sat Jan 09 21:57:16 CET 2010
 eclipse.preferences.version=1
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=0

L2_GameServer/java/com/l2jserver/gameserver/ai/L2AttackableAI.java

@@ -143,7 +143,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 	 */
 	private boolean autoAttackCondition(L2Character target)
 	{
-		if (target == null) 
+		if (target == null || _actor == null) 
 			return false;
 			
 		L2Attackable me = (L2Attackable) _actor;
@@ -169,7 +169,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 
 		// Check if the target isn't dead, is in the Aggro range and is at the same height
 		if (target.isAlikeDead() || (target instanceof L2PcInstance && !me.isInsideRadius(target, me.getAggroRange(), false, false)) 
-				||Math.abs(_actor.getZ() - target.getZ()) > 300 || (target instanceof L2Summon && !me.isInsideRadius(target, me.getAggroRange(), false, false))) return false;
+				|| Math.abs(me.getZ() - target.getZ()) > 300 || (target instanceof L2Summon && !me.isInsideRadius(target, me.getAggroRange(), false, false))) return false;
 
 		// Check if the target is a L2PlayableInstance
 		if (target instanceof L2Playable)

L2_GameServer/java/com/l2jserver/gameserver/model/L2ItemInstance.java

@@ -743,8 +743,8 @@ public final class L2ItemInstance extends L2Object
     {
     	return (
 		(!isEquipped()) // Not equipped
-    		&& (getItem().getType2() != 3) // Not Quest Item
-    		&& (getItem().getType2() != 4 || getItem().getType1() != 1) // TODO: what does this mean?
+    		&& (getItem().getType2() != L2Item.TYPE2_QUEST) // Not Quest Item
+    		&& (getItem().getType2() != L2Item.TYPE2_MONEY || getItem().getType1() != L2Item.TYPE1_SHIELD_ARMOR) // not money, not shield
     		&& (player.getPet() == null || getObjectId() != player.getPet().getControlItemId()) // Not Control item of currently summoned pet
     		&& (player.getActiveEnchantItem() != this) // Not momentarily used enchant scroll
     		&& (allowAdena || getItemId() != 57) // Not adena

L2_GameServer/java/com/l2jserver/gameserver/model/L2Party.java

@@ -38,6 +38,7 @@ import com.l2jserver.gameserver.network.serverpackets.ExOpenMPCC;
 import com.l2jserver.gameserver.network.serverpackets.ExPartyPetWindowAdd;
 import com.l2jserver.gameserver.network.serverpackets.ExPartyPetWindowDelete;
 import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
+import com.l2jserver.gameserver.network.serverpackets.PartyMemberPosition;
 import com.l2jserver.gameserver.network.serverpackets.PartySmallWindowAdd;
 import com.l2jserver.gameserver.network.serverpackets.PartySmallWindowAll;
 import com.l2jserver.gameserver.network.serverpackets.PartySmallWindowDelete;
@@ -274,6 +275,10 @@ public class L2Party {
 		msg.addString(player.getName());
 		broadcastToPartyMembers(msg);
 		broadcastToPartyMembers(new PartySmallWindowAdd(player));
+		// send the position of all party members to the new party member
+		player.sendPacket(new PartyMemberPosition(player));
+		// send the position of the new party member to all party members (except the new one - he knows his own position)
+		broadcastToPartyMembers(player, new PartyMemberPosition(player));
 
         // if member has pet/summon add it to other as well
         if (player.getPet() != null)

L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java

@@ -137,7 +137,8 @@ public class L2PetInstance extends L2Summon
 				}
 
 				int[] foodIds = PetDataTable.getFoodItemId(getTemplate().npcId);
-				if (foodIds[0] == 0) return;
+				if (foodIds[0] == 0)
+					return;
 				L2ItemInstance food = null;
 				food = getInventory().getItemByItemId(foodIds[0]);