Răsfoiți Sursa

Minor update to match [DP8000]
* Let's use the same type to load than store for Hp and Mp.
* RestorePetOnReconnect is default True.

Zoey76 14 ani în urmă
părinte
comite
03ea9598a6

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/Config.java

@@ -1522,8 +1522,8 @@ public final class Config
 					ALT_GAME_SKILL_LEARN = Boolean.parseBoolean(Character.getProperty("AltGameSkillLearn", "false"));
 					ALT_GAME_SUBCLASS_WITHOUT_QUESTS = Boolean.parseBoolean(Character.getProperty("AltSubClassWithoutQuests", "False"));
 					ALT_GAME_SUBCLASS_EVERYWHERE = Boolean.parseBoolean(Character.getProperty("AltSubclassEverywhere", "True"));
-					RESTORE_SERVITOR_ON_RECONNECT = Boolean.parseBoolean(Character.getProperty("RestoreServitorOnReconnect", "true"));
-					RESTORE_PET_ON_RECONNECT = Boolean.parseBoolean(Character.getProperty("RestorePetOnReconnect", "False"));
+					RESTORE_SERVITOR_ON_RECONNECT = Boolean.parseBoolean(Character.getProperty("RestoreServitorOnReconnect", "True"));
+					RESTORE_PET_ON_RECONNECT = Boolean.parseBoolean(Character.getProperty("RestorePetOnReconnect", "True"));
 					ENABLE_VITALITY = Boolean.parseBoolean(Character.getProperty("EnableVitality", "True"));
 					RECOVER_VITALITY_ON_RECONNECT = Boolean.parseBoolean(Character.getProperty("RecoverVitalityOnReconnect", "True"));
 					STARTING_VITALITY_POINTS = Integer.parseInt(Character.getProperty("StartingVitalityPoints", "20000"));

+ 3 - 4
L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/CharSummonTable.java

@@ -47,7 +47,7 @@ public class CharSummonTable
 	
 	private static final String INIT_SUMMONS = "SELECT ownerId, summonSkillId FROM character_summons";
 	private static final String INIT_PET = "SELECT ownerId, item_obj_id FROM pets WHERE restore = 'true'";
-
+	
 	private static final String SAVE_SUMMON = "REPLACE INTO character_summons (ownerId,summonSkillId,curHp,curMp,time) VALUES (?,?,?,?,?)";
 	private static final String LOAD_SUMMON = "SELECT curHp, curMp, time FROM character_summons WHERE ownerId = ? AND summonSkillId = ?";
 	private static final String REMOVE_SUMMON = "DELETE FROM character_summons WHERE ownerId = ?";
@@ -115,7 +115,6 @@ public class CharSummonTable
 				rset.close();
 				statement.close();
 			}
-			
 			catch (Exception e)
 			{
 				_log.log(Level.SEVERE, "Error while loading saved summons", e);
@@ -147,8 +146,8 @@ public class CharSummonTable
 			
 			statement.setInt(1, summon.getOwner().getObjectId());
 			statement.setInt(2, summon.getReferenceSkill());
-			statement.setDouble(3, summon.getCurrentHp());
-			statement.setDouble(4, summon.getCurrentMp());
+			statement.setInt(3, (int) Math.round(summon.getCurrentHp()));
+			statement.setInt(4, (int) Math.round(summon.getCurrentMp()));
 			statement.setInt(5, summon.getTimeRemaining());
 			
 			statement.execute();

+ 3 - 3
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java

@@ -839,10 +839,10 @@ public class L2PetInstance extends L2Summon
 			pet.getStat().setExp(exp);
 			pet.getStat().setSp(rset.getInt("sp"));
 			
-			pet.getStatus().setCurrentHp(rset.getDouble("curHp"));
-			pet.getStatus().setCurrentMp(rset.getDouble("curMp"));
+			pet.getStatus().setCurrentHp(rset.getInt("curHp"));
+			pet.getStatus().setCurrentMp(rset.getInt("curMp"));
 			pet.getStatus().setCurrentCp(pet.getMaxCp());
-			if (rset.getDouble("curHp") < 0.5)
+			if (rset.getDouble("curHp") < 1)
 			{
 				pet.setIsDead(true);
 				pet.stopHpMpRegeneration();