Changeset 5145
- Timestamp:
- Jan 23, 2012 9:53:52 PM (4 months ago)
- Location:
- branches/unstable/L2J_Server_BETA/java/com/l2jserver
- Files:
-
- 10 edited
-
L2DatabaseFactory.java (modified) (3 diffs)
-
gameserver/model/L2CommandChannel.java (modified) (2 diffs)
-
gameserver/model/L2Manor.java (modified) (1 diff)
-
gameserver/model/entity/Fort.java (modified) (1 diff)
-
gameserver/model/entity/Hero.java (modified) (12 diffs)
-
gameserver/model/entity/Siege.java (modified) (4 diffs)
-
gameserver/model/itemcontainer/Inventory.java (modified) (5 diffs)
-
gameserver/skills/DocumentBase.java (modified) (1 diff)
-
loginserver/L2LoginServer.java (modified) (1 diff)
-
loginserver/mail/MailSystem.java (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/unstable/L2J_Server_BETA/java/com/l2jserver/L2DatabaseFactory.java
r5144 r5145 28 28 public class L2DatabaseFactory 29 29 { 30 staticLogger _log = Logger.getLogger(L2DatabaseFactory.class.getName());30 private static final Logger _log = Logger.getLogger(L2DatabaseFactory.class.getName()); 31 31 32 32 public static enum ProviderType … … 155 155 public final String safetyString(String... whatToCheck) 156 156 { 157 // NOTE: Use brace as a saf ty precaution just incase name is a reserved word157 // NOTE: Use brace as a safety precaution just in case name is a reserved word 158 158 final char braceLeft; 159 159 final char braceRight; … … 209 209 { 210 210 Connection con = null; 211 212 211 while (con == null) 213 212 { -
branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2CommandChannel.java
r4921 r5145 31 31 32 32 /** 33 *34 33 * @author chris_00 35 34 */ … … 117 116 removeParty(party); 118 117 } 119 }120 _partys.clear();121 } 122 123 /** 124 * @return overall member count of the Command Channel118 _partys.clear(); 119 } 120 } 121 122 /** 123 * @return overall member count of the Command Channel 125 124 */ 126 125 public int getMemberCount() -
branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Manor.java
r5083 r5145 387 387 { 388 388 _log.log(Level.WARNING, "Could not parse seeds.xml file: " + e.getMessage(), e); 389 return; 389 390 } 390 391 -
branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Fort.java
r4994 r5145 437 437 public boolean setOwner(L2Clan clan, boolean updateClansReputation) 438 438 { 439 L2Clan oldowner = getOwnerClan(); 440 441 // Remove old owner 442 if (oldowner != null && clan != null && clan != oldowner) 439 if (clan == null) 440 { 441 _log.warning(getClass().getSimpleName() + ": Updating Fort owner with null clan!!!"); 442 return false; 443 } 444 final L2Clan oldowner = getOwnerClan(); 445 if (oldowner != null && clan != oldowner) 443 446 { 444 447 // Remove points from old owner -
branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Hero.java
r5083 r5145 30 30 import java.util.List; 31 31 import java.util.Map; 32 import java.util.Map.Entry; 32 33 import java.util.logging.Level; 33 34 import java.util.logging.Logger; … … 74 75 private static final String DELETE_ITEMS = "DELETE FROM items WHERE item_id IN " + "(6842, 6611, 6612, 6613, 6614, 6615, 6616, 6617, 6618, 6619, 6620, 6621, 9388, 9389, 9390) " + "AND owner_id NOT IN (SELECT charId FROM characters WHERE accesslevel > 0)"; 75 76 76 private static Map<Integer, StatsSet> _heroes;77 private static Map<Integer, StatsSet> _completeHeroes;78 79 private static Map<Integer, StatsSet> _herocounts;80 private static Map<Integer, List<StatsSet>> _herofights;81 private static List<StatsSet> _fights;82 83 private static Map<Integer, List<StatsSet>> _herodiary;84 private static Map<Integer, String> _heroMessage;85 private static List<StatsSet> _diary;77 private static final Map<Integer, StatsSet> _heroes = new FastMap<Integer, StatsSet>(); 78 private static final Map<Integer, StatsSet> _completeHeroes = new FastMap<Integer, StatsSet>(); 79 80 private static final Map<Integer, StatsSet> _herocounts = new FastMap<Integer, StatsSet>(); 81 private static final Map<Integer, List<StatsSet>> _herofights = new FastMap<Integer, List<StatsSet>>(); 82 private static final List<StatsSet> _fights = new FastList<StatsSet>(); 83 84 private static final Map<Integer, List<StatsSet>> _herodiary = new FastMap<Integer, List<StatsSet>>(); 85 private static final Map<Integer, String> _heroMessage = new FastMap<Integer, String>(); 86 private static final List<StatsSet> _diary = new FastList<StatsSet>(); 86 87 87 88 public static final String COUNT = "count"; … … 108 109 private void init() 109 110 { 110 _heroes = new FastMap<Integer, StatsSet>(); 111 _completeHeroes = new FastMap<Integer, StatsSet>(); 112 113 _herofights = new FastMap<Integer, List<StatsSet>>(); 114 _herocounts = new FastMap<Integer, StatsSet>(); 115 _herodiary = new FastMap<Integer, List<StatsSet>>(); 116 _heroMessage = new FastMap<Integer, String>(); 111 _heroes.clear(); 112 _completeHeroes.clear(); 113 _herocounts.clear(); 114 _herofights.clear(); 115 _herodiary.clear(); 116 _heroMessage.clear(); 117 117 118 118 Connection con = null; … … 233 233 catch (SQLException e) 234 234 { 235 _log.warning("Hero System: Couldnt load Heroes"); 236 if (Config.DEBUG) 237 { 238 _log.log(Level.WARNING, "", e); 239 } 235 _log.log(Level.WARNING, "Hero System: Couldnt load Heroes", e); 240 236 } 241 237 finally … … 290 286 public void loadDiary(int charId) 291 287 { 292 _diary = new FastList<StatsSet>(); 293 288 _diary.clear(); 294 289 int diaryentries = 0; 295 290 Connection con = null; … … 344 339 catch (SQLException e) 345 340 { 346 _log.warning("Hero System: Couldnt load Hero Diary for CharId: " + charId); 347 if (Config.DEBUG) 348 _log.log(Level.WARNING, "", e); 341 _log.log(Level.WARNING, "Hero System: Couldnt load Hero Diary for CharId: " + charId, e); 349 342 } 350 343 finally … … 356 349 public void loadFights(int charId) 357 350 { 358 _fights = new FastList<StatsSet>(); 359 351 _fights.clear(); 360 352 StatsSet _herocountdata = new StatsSet(); 361 362 353 Calendar _data = Calendar.getInstance(); 363 354 _data.set(Calendar.DAY_OF_MONTH, 1); … … 382 373 ResultSet rset = statement.executeQuery(); 383 374 375 int charOneId; 376 int charOneClass; 377 int charTwoId; 378 int charTwoClass; 379 int winner; 380 long start; 381 int time; 382 int classed; 384 383 while (rset.next()) 385 384 { 386 intcharOneId = rset.getInt("charOneId");387 intcharOneClass = rset.getInt("charOneClass");388 intcharTwoId = rset.getInt("charTwoId");389 intcharTwoClass = rset.getInt("charTwoClass");390 intwinner = rset.getInt("winner");391 longstart = rset.getLong("start");392 inttime = rset.getInt("time");393 intclassed = rset.getInt("classed");385 charOneId = rset.getInt("charOneId"); 386 charOneClass = rset.getInt("charOneClass"); 387 charTwoId = rset.getInt("charTwoId"); 388 charTwoClass = rset.getInt("charTwoClass"); 389 winner = rset.getInt("winner"); 390 start = rset.getLong("start"); 391 time = rset.getInt("time"); 392 classed = rset.getInt("classed"); 394 393 395 394 if (charId == charOneId) … … 480 479 catch (SQLException e) 481 480 { 482 _log.warning("Hero System: Couldnt load Hero fights history for CharId: " + charId); 483 if (Config.DEBUG) 484 _log.log(Level.WARNING, "", e); 481 _log.log(Level.WARNING, "Hero System: Couldnt load Hero fights history for CharId: " + charId, e); 485 482 } 486 483 finally … … 788 785 updateHeroes(false); 789 786 787 L2PcInstance player; 790 788 for(Integer charId : _heroes.keySet()) 791 789 { 792 L2PcInstance player = L2World.getInstance().getPlayer(charId); 793 790 player = L2World.getInstance().getPlayer(charId); 794 791 if (player != null) 795 792 { … … 879 876 else 880 877 { 881 for (Integer heroId : _heroes.keySet()) 882 { 883 StatsSet hero = _heroes.get(heroId); 884 885 if ((_completeHeroes == null) || !_completeHeroes.containsKey(heroId)) 878 StatsSet hero; 879 int heroId; 880 for (Entry<Integer, StatsSet> entry : _heroes.entrySet()) 881 { 882 hero = entry.getValue(); 883 heroId = entry.getKey(); 884 if (_completeHeroes.isEmpty() || !_completeHeroes.containsKey(heroId)) 886 885 { 887 886 statement = con.prepareStatement(INSERT_HERO); … … 947 946 catch (SQLException e) 948 947 { 949 _log.warning("Hero System: Couldnt update Heroes"); 950 if (Config.DEBUG) 951 { 952 _log.log(Level.WARNING, "", e); 953 } 948 _log.log(Level.WARNING, "Hero System: Couldnt update Heroes", e); 954 949 } 955 950 finally -
branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Siege.java
r5134 r5145 105 105 { 106 106 SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTES_UNTIL_SIEGE_CONCLUSION); 107 sm.addNumber( Math.round(timeRemaining / 60000));107 sm.addNumber((int) timeRemaining / 60000); 108 108 announceToPlayer(sm, true); 109 109 ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndSiegeTask(_castleInst), timeRemaining - 600000); // Prepare task for 10 minute left. … … 112 112 { 113 113 SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTES_UNTIL_SIEGE_CONCLUSION); 114 sm.addNumber( Math.round(timeRemaining / 60000));114 sm.addNumber((int) timeRemaining / 60000); 115 115 announceToPlayer(sm, true); 116 116 ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndSiegeTask(_castleInst), timeRemaining - 300000); // Prepare task for 5 minute left. … … 119 119 { 120 120 SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTES_UNTIL_SIEGE_CONCLUSION); 121 sm.addNumber( Math.round(timeRemaining / 60000));121 sm.addNumber((int) timeRemaining / 60000); 122 122 announceToPlayer(sm, true); 123 123 ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndSiegeTask(_castleInst), timeRemaining - 10000); // Prepare task for 10 seconds count down … … 126 126 { 127 127 SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CASTLE_SIEGE_S1_SECONDS_LEFT); 128 sm.addNumber( Math.round(timeRemaining / 1000));128 sm.addNumber((int) timeRemaining / 1000); 129 129 announceToPlayer(sm, true); 130 130 ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndSiegeTask(_castleInst), timeRemaining); // Prepare task for second count down -
branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemcontainer/Inventory.java
r5143 r5145 843 843 844 844 /** 845 * Returns the item in the paperdoll slot 846 * @param slot 847 * @return L2ItemInstance 845 * @param slot the slot. 846 * @return the item in the paperdoll slot 848 847 */ 849 848 public L2ItemInstance getPaperdollItem(int slot) … … 921 920 922 921 /** 923 * Returns the ID of the item in the paperdol slot922 * Returns the ID of the item in the paperdoll slot 924 923 * @param slot : int designating the slot 925 924 * @return int designating the ID of the item … … 1057 1056 { 1058 1057 int slot = -1; 1059 int location = item.getLocationSlot(); 1060 1058 final int location = item.getLocationSlot(); 1061 1059 switch(location) 1062 1060 { 1063 case PAPERDOLL_UNDER: slot = L2Item.SLOT_UNDERWEAR; 1064 break; 1065 case PAPERDOLL_LEAR: slot = L2Item.SLOT_L_EAR; 1066 break; 1067 case PAPERDOLL_REAR: slot = L2Item.SLOT_R_EAR; 1068 break; 1069 case PAPERDOLL_NECK: slot = L2Item.SLOT_NECK; 1070 break; 1071 case PAPERDOLL_RFINGER: slot = L2Item.SLOT_R_FINGER; 1072 break; 1073 case PAPERDOLL_LFINGER: slot = L2Item.SLOT_L_FINGER; 1074 break; 1075 case PAPERDOLL_HAIR: slot = L2Item.SLOT_HAIR; 1076 break; 1077 case PAPERDOLL_HAIR2: slot = L2Item.SLOT_HAIR2; 1078 break; 1079 case PAPERDOLL_HEAD: slot = L2Item.SLOT_HEAD; 1080 break; 1081 case PAPERDOLL_RHAND: slot = L2Item.SLOT_R_HAND; 1082 break; 1083 case PAPERDOLL_LHAND: slot = L2Item.SLOT_L_HAND; 1084 break; 1085 case PAPERDOLL_GLOVES: slot = L2Item.SLOT_GLOVES; 1086 break; 1087 case PAPERDOLL_CHEST: slot = item.getItem().getBodyPart(); 1088 break; 1089 case PAPERDOLL_LEGS: slot = L2Item.SLOT_LEGS; 1090 break; 1091 case PAPERDOLL_CLOAK: slot = L2Item.SLOT_BACK; 1092 break; 1093 case PAPERDOLL_FEET: slot = L2Item.SLOT_FEET; 1094 break; 1095 case PAPERDOLL_LBRACELET: slot = L2Item.SLOT_L_BRACELET; 1096 break; 1097 case PAPERDOLL_RBRACELET: slot = L2Item.SLOT_R_BRACELET; 1098 break; 1061 case PAPERDOLL_UNDER: 1062 slot = L2Item.SLOT_UNDERWEAR; 1063 break; 1064 case PAPERDOLL_LEAR: 1065 slot = L2Item.SLOT_L_EAR; 1066 break; 1067 case PAPERDOLL_REAR: 1068 slot = L2Item.SLOT_R_EAR; 1069 break; 1070 case PAPERDOLL_NECK: 1071 slot = L2Item.SLOT_NECK; 1072 break; 1073 case PAPERDOLL_RFINGER: 1074 slot = L2Item.SLOT_R_FINGER; 1075 break; 1076 case PAPERDOLL_LFINGER: 1077 slot = L2Item.SLOT_L_FINGER; 1078 break; 1079 case PAPERDOLL_HAIR: 1080 slot = L2Item.SLOT_HAIR; 1081 break; 1082 case PAPERDOLL_HAIR2: 1083 slot = L2Item.SLOT_HAIR2; 1084 break; 1085 case PAPERDOLL_HEAD: 1086 slot = L2Item.SLOT_HEAD; 1087 break; 1088 case PAPERDOLL_RHAND: 1089 slot = L2Item.SLOT_R_HAND; 1090 break; 1091 case PAPERDOLL_LHAND: 1092 slot = L2Item.SLOT_L_HAND; 1093 break; 1094 case PAPERDOLL_GLOVES: 1095 slot = L2Item.SLOT_GLOVES; 1096 break; 1097 case PAPERDOLL_CHEST: 1098 slot = item.getItem().getBodyPart(); 1099 break; 1100 case PAPERDOLL_LEGS: 1101 slot = L2Item.SLOT_LEGS; 1102 break; 1103 case PAPERDOLL_CLOAK: 1104 slot = L2Item.SLOT_BACK; 1105 break; 1106 case PAPERDOLL_FEET: 1107 slot = L2Item.SLOT_FEET; 1108 break; 1109 case PAPERDOLL_LBRACELET: 1110 slot = L2Item.SLOT_L_BRACELET; 1111 break; 1112 case PAPERDOLL_RBRACELET: 1113 slot = L2Item.SLOT_R_BRACELET; 1114 break; 1099 1115 case PAPERDOLL_DECO1: 1100 1116 case PAPERDOLL_DECO2: … … 1102 1118 case PAPERDOLL_DECO4: 1103 1119 case PAPERDOLL_DECO5: 1104 case PAPERDOLL_DECO6: slot = L2Item.SLOT_DECO; 1105 break; 1106 case PAPERDOLL_BELT: slot = L2Item.SLOT_BELT; 1107 break; 1120 case PAPERDOLL_DECO6: 1121 slot = L2Item.SLOT_DECO; 1122 break; 1123 case PAPERDOLL_BELT: 1124 slot = L2Item.SLOT_BELT; 1125 break; 1108 1126 } 1109 1127 return slot; … … 1586 1604 while (inv.next()) 1587 1605 { 1588 // Check if that item already exists in OID map.1589 if (L2World.getInstance().findObject(inv.getInt("object_id")) != null)1590 continue;1591 1592 1606 item = L2ItemInstance.restoreFromDb(getOwnerId(), inv); 1593 1594 1607 if (item == null) 1595 1608 continue; -
branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/skills/DocumentBase.java
r5083 r5145 353 353 EffectTemplate lt; 354 354 355 final boolean isChanceSkillTrigger = (name =="ChanceSkillTrigger");355 final boolean isChanceSkillTrigger = name.equals("ChanceSkillTrigger"); 356 356 int trigId = 0; 357 357 if (attrs.getNamedItem("triggeredId") != null) -
branches/unstable/L2J_Server_BETA/java/com/l2jserver/loginserver/L2LoginServer.java
r5140 r5145 42 42 43 43 /** 44 *45 44 * @author KenM 46 45 */ 47 public class L2LoginServer46 public final class L2LoginServer 48 47 { 49 48 private final Logger _log = Logger.getLogger(L2LoginServer.class.getName()); -
branches/unstable/L2J_Server_BETA/java/com/l2jserver/loginserver/mail/MailSystem.java
r4921 r5145 33 33 34 34 /** 35 *36 35 * @author mrTJO 37 36 */ … … 40 39 private final static Logger _log = Logger.getLogger(MailSystem.class.getName()); 41 40 private final Map<String, MailContent> _mailData = new FastMap<String, MailContent>(); 42 41 43 42 public static MailSystem getInstance() 44 43 { … … 73 72 { 74 73 _log.log(Level.WARNING, "Could not parse MailList.xml file: " + e.getMessage(), e); 74 return; 75 75 } 76 76 … … 86 86 try 87 87 { 88 FileInputStream fis = new FileInputStream(new File(Config.DATAPACK_ROOT, "data/mail/" +maFile));88 FileInputStream fis = new FileInputStream(new File(Config.DATAPACK_ROOT, "data/mail/" + maFile)); 89 89 BufferedInputStream bis = new BufferedInputStream(fis); 90 90 int bytes = bis.available(); … … 101 101 catch (IOException e) 102 102 { 103 _log.warning("IOException while reading " +maFile);103 _log.warning("IOException while reading " + maFile); 104 104 } 105 105 } … … 108 108 } 109 109 else 110 { 110 111 _log.warning("Cannot load eMail System - Missing file MailList.xml"); 112 } 111 113 } 112 114 113 class MailContent115 public class MailContent 114 116 { 115 117 private final String _subject; … … 117 119 118 120 /** 119 * @param subject 120 * @param text 121 * @param subject 122 * @param text 121 123 */ 122 124 public MailContent(String subject, String text)
Note: See TracChangeset
for help on using the changeset viewer.
