浏览代码

BETA: Misc fixes:
* SQL query updated missing from [5240], fix for #6128
* Set L2PcTemplate#getClassName() as deprecated.
* Fixed order in imports in ClanWarehouseListener.

Zoey76 13 年之前
父节点
当前提交
b070eb153b

+ 6 - 8
L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/CharTemplateTable.java

@@ -44,14 +44,14 @@ public final class CharTemplateTable
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			final PreparedStatement statement = con.prepareStatement("SELECT * FROM class_list, char_templates, lvlupgain" + " WHERE class_list.id = char_templates.classId" + " AND class_list.id = lvlupgain.classId" + " ORDER BY class_list.id");
+			final PreparedStatement statement = con.prepareStatement("SELECT * FROM char_templates, lvlupgain WHERE char_templates.classId = lvlupgain.classId ORDER BY char_templates.ClassId");
 			final ResultSet rset = statement.executeQuery();
-			
-			int count = 0;
+			StatsSet set;
+			int cId;
 			while (rset.next())
 			{
-				final StatsSet set = new StatsSet();
-				final int cId = rset.getInt("id");
+				set = new StatsSet();
+				cId = rset.getInt("ClassId");
 				set.set("classId", cId);
 				set.set("className", rset.getString("className"));
 				set.set("raceId", rset.getInt("raceId"));
@@ -97,12 +97,10 @@ public final class CharTemplateTable
 				
 				final L2PcTemplate ct = new L2PcTemplate(set, InitialEquipmentData.getInstance().getEquipmentList(cId));
 				_charTemplates.put(ClassId.getClassId(cId), ct);
-				++count;
 			}
 			rset.close();
 			statement.close();
-			
-			_log.info("CharTemplateTable: Loaded " + count + " Character Templates.");
+			_log.info("CharTemplateTable: Loaded " + _charTemplates.size() + " Character Templates.");
 		}
 		catch (SQLException e)
 		{

+ 3 - 0
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/templates/L2PcTemplate.java

@@ -18,6 +18,7 @@ import java.util.List;
 
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.base.ClassId;
+import com.l2jserver.gameserver.model.base.ClassInfo;
 import com.l2jserver.gameserver.model.base.Race;
 import com.l2jserver.gameserver.model.items.PcItemTemplate;
 
@@ -100,7 +101,9 @@ public class L2PcTemplate extends L2CharTemplate
 	
 	/**
 	 * @return the template server side class name.
+	 * @deprecated replaced by {@link ClassInfo#getClassName(boolean)}
 	 */
+	@Deprecated
 	public String getClassName()
 	{
 		return _className;

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/listeners/clan/ClanWarehouseListener.java

@@ -15,10 +15,10 @@
 package com.l2jserver.gameserver.scripting.scriptengine.listeners.clan;
 
 import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.itemcontainer.ClanWarehouse;
 import com.l2jserver.gameserver.scripting.scriptengine.events.ClanWarehouseAddItemEvent;
 import com.l2jserver.gameserver.scripting.scriptengine.events.ClanWarehouseDeleteItemEvent;
 import com.l2jserver.gameserver.scripting.scriptengine.events.ClanWarehouseTransferEvent;
-import com.l2jserver.gameserver.model.itemcontainer.ClanWarehouse;
 import com.l2jserver.gameserver.scripting.scriptengine.impl.L2JListener;
 
 /**