浏览代码

BETA: The rest of [6141]
* Reported by: lion

Rumen Nikiforov 11 年之前
父节点
当前提交
442196fd48

+ 0 - 11
L2J_Server_BETA/java/com/l2jserver/gameserver/model/CharSelectInfoPackage.java

@@ -53,7 +53,6 @@ public class CharSelectInfoPackage
 	private int _pkKills = 0;
 	private int _pvpKills = 0;
 	private int _augmentationId = 0;
-	private int _transformId = 0;
 	private int _x = 0;
 	private int _y = 0;
 	private int _z = 0;
@@ -351,16 +350,6 @@ public class CharSelectInfoPackage
 		return _pvpKills;
 	}
 	
-	public int getTransformId()
-	{
-		return _transformId;
-	}
-	
-	public void setTransformId(int id)
-	{
-		_transformId = id;
-	}
-	
 	public int getX()
 	{
 		return _x;

+ 1 - 29
L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/CharSelectionInfo.java

@@ -31,7 +31,6 @@ import com.l2jserver.Config;
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.datatables.ClanTable;
 import com.l2jserver.gameserver.datatables.ExperienceTable;
-import com.l2jserver.gameserver.instancemanager.CursedWeaponsManager;
 import com.l2jserver.gameserver.model.CharSelectInfoPackage;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.itemcontainer.Inventory;
@@ -219,7 +218,7 @@ public class CharSelectionInfo extends L2GameServerPacket
 		List<CharSelectInfoPackage> characterList = new FastList<>();
 		
 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement statement = con.prepareStatement("SELECT account_name, charId, char_name, level, maxHp, curHp, maxMp, curMp, face, hairStyle, hairColor, sex, heading, x, y, z, exp, sp, karma, pvpkills, pkkills, clanid, race, classid, deletetime, cancraft, title, accesslevel, online, char_slot, lastAccess, base_class, transform_id, language, vitality_points FROM characters WHERE account_name=? ORDER BY createDate"))
+			PreparedStatement statement = con.prepareStatement("SELECT * FROM characters WHERE account_name=? ORDER BY createDate"))
 		{
 			statement.setString(1, loginName);
 			try (ResultSet charList = statement.executeQuery())
@@ -341,33 +340,6 @@ public class CharSelectionInfo extends L2GameServerPacket
 			weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND);
 		}
 		
-		// Check Transformation
-		int cursedWeaponId = CursedWeaponsManager.getInstance().checkOwnsWeaponId(objectId);
-		if (cursedWeaponId > 0)
-		{
-			// cursed weapon transformations
-			if (cursedWeaponId == 8190)
-			{
-				charInfopackage.setTransformId(301);
-			}
-			else if (cursedWeaponId == 8689)
-			{
-				charInfopackage.setTransformId(302);
-			}
-			else
-			{
-				charInfopackage.setTransformId(0);
-			}
-		}
-		else if (chardata.getInt("transform_id") > 0)
-		{
-			charInfopackage.setTransformId(chardata.getInt("transform_id"));
-		}
-		else
-		{
-			charInfopackage.setTransformId(0);
-		}
-		
 		if (weaponObjId > 0)
 		{
 			try (Connection con = L2DatabaseFactory.getInstance().getConnection();