· 6 years ago · Jan 18, 2020, 09:06 PM
1Index: aCis_gameserver/java/net/sf/l2j/gameserver/model/multisell/Ingredient.java
2IDEA additional info:
3Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
4<+>ISO-8859-1
5===================================================================
6--- aCis_gameserver/java/net/sf/l2j/gameserver/model/multisell/Ingredient.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
7+++ aCis_gameserver/java/net/sf/l2j/gameserver/model/multisell/Ingredient.java (date 1579381340911)
8@@ -102,12 +102,12 @@
9
10 public final boolean isStackable()
11 {
12- return (_template == null) ? true : _template.isStackable();
13+ return (_template == null) || _template.isStackable();
14 }
15
16 public final boolean isArmorOrWeapon()
17 {
18- return (_template == null) ? false : (_template instanceof Armor) || (_template instanceof Weapon);
19+ return (_template != null) && ((_template instanceof Armor) || (_template instanceof Weapon));
20 }
21
22 public final int getWeight()
23Index: aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/Player.java
24IDEA additional info:
25Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
26<+>ISO-8859-1
27===================================================================
28--- aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/Player.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
29+++ aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/Player.java (date 1579381341591)
30@@ -450,8 +450,8 @@
31
32 protected Set<Integer> _activeSoulShots = ConcurrentHashMap.newKeySet(1);
33
34- private final int _loto[] = new int[5];
35- private final int _race[] = new int[2];
36+ private final int[] _loto = new int[5];
37+ private final int[] _race = new int[2];
38
39 private final BlockList _blockList = new BlockList(this);
40
41@@ -825,8 +825,7 @@
42 {
43 if (_dwarvenRecipeBook.containsKey(recipeId))
44 _dwarvenRecipeBook.remove(recipeId);
45- else if (_commonRecipeBook.containsKey(recipeId))
46- _commonRecipeBook.remove(recipeId);
47+ else _commonRecipeBook.remove(recipeId);
48
49 // Delete all existing shortcuts refering to this recipe id.
50 getShortcutList().deleteShortcuts(recipeId, ShortcutType.RECIPE);
51@@ -4735,7 +4734,7 @@
52 */
53 public boolean checkFoodState(double state)
54 {
55- return (_canFeed) ? getCurrentFeed() < (_petData.getMaxMeal() * state) : false;
56+ return (_canFeed) && getCurrentFeed() < (_petData.getMaxMeal() * state);
57 }
58
59 public void setUptime(long time)
60@@ -5846,10 +5845,7 @@
61 // Check if the attacker is in olympiad and olympiad start
62 if (attacker instanceof Player && cha.isInOlympiadMode())
63 {
64- if (isInOlympiadMode() && isOlympiadStart() && cha.getOlympiadGameId() == getOlympiadGameId())
65- return true;
66-
67- return false;
68+ return isInOlympiadMode() && isOlympiadStart() && cha.getOlympiadGameId() == getOlympiadGameId();
69 }
70
71 // is AutoAttackable if both players are in the same duel and the duel is still going on
72@@ -5901,10 +5897,7 @@
73 }
74
75 // Check if the Player has Karma
76- if (getKarma() > 0 || getPvpFlag() > 0)
77- return true;
78-
79- return false;
80+ return getKarma() > 0 || getPvpFlag() > 0;
81 }
82
83 /**
84@@ -6111,7 +6104,7 @@
85
86 if (target instanceof Door)
87 {
88- if (!((Door) target).isAutoAttackable(this) // Siege doors only hittable during siege
89+ if (!target.isAutoAttackable(this) // Siege doors only hittable during siege
90 || (((Door) target).isUnlockable() && skill.getSkillType() != L2SkillType.UNLOCK)) // unlockable doors
91 {
92 sendPacket(SystemMessageId.INCORRECT_TARGET);
93@@ -6499,17 +6492,11 @@
94 // Same Party
95 if (getParty().getLeader() == targetPlayer.getParty().getLeader())
96 {
97- if (skill.getEffectRange() > 0 && isCtrlPressed && getTarget() == target && skill.isDamage())
98- return true;
99-
100- return false;
101+ return skill.getEffectRange() > 0 && isCtrlPressed && getTarget() == target && skill.isDamage();
102 }
103 else if (getParty().getCommandChannel() != null && getParty().getCommandChannel().containsPlayer(targetPlayer))
104 {
105- if (skill.getEffectRange() > 0 && isCtrlPressed && getTarget() == target && skill.isDamage())
106- return true;
107-
108- return false;
109+ return skill.getEffectRange() > 0 && isCtrlPressed && getTarget() == target && skill.isDamage();
110 }
111 }
112
113@@ -6537,10 +6524,7 @@
114 else if (getClanId() == targetPlayer.getClanId() || (getAllyId() > 0 && getAllyId() == targetPlayer.getAllyId()))
115 {
116 // Check if skill can do dmg
117- if (skill.getEffectRange() > 0 && isCtrlPressed && getTarget() == target && skill.isDamage())
118- return true;
119-
120- return false;
121+ return skill.getEffectRange() > 0 && isCtrlPressed && getTarget() == target && skill.isDamage();
122 }
123 }
124
125@@ -6548,16 +6532,10 @@
126 if (targetPlayer.getPvpFlag() == 0 && targetPlayer.getKarma() == 0)
127 {
128 // Check if skill can do dmg
129- if (skill.getEffectRange() > 0 && isCtrlPressed && getTarget() == target && skill.isDamage())
130- return true;
131-
132- return false;
133+ return skill.getEffectRange() > 0 && isCtrlPressed && getTarget() == target && skill.isDamage();
134 }
135-
136- if (targetPlayer.getPvpFlag() > 0 || targetPlayer.getKarma() > 0)
137- return true;
138-
139- return false;
140+
141+ return targetPlayer.getPvpFlag() > 0 || targetPlayer.getKarma() > 0;
142 }
143 return true;
144 }
145@@ -8738,8 +8716,7 @@
146 }
147 else
148 {
149- if (target.getPvpFlag() == 0 && target.getKarma() == 0)
150- return false;
151+ return target.getPvpFlag() != 0 || target.getKarma() != 0;
152 }
153 }
154 return true;
155@@ -8936,11 +8913,8 @@
156
157 if (isCastingNow() || isCastingSimultaneouslyNow())
158 return false;
159-
160- if (isInBoat())
161- return false;
162-
163- return true;
164+
165+ return !isInBoat();
166 }
167
168 public List<Integer> getFriendList()
169@@ -8956,8 +8930,7 @@
170
171 public void deselectFriend(Integer friendId)
172 {
173- if (_selectedFriendList.contains(friendId))
174- _selectedFriendList.remove(friendId);
175+ _selectedFriendList.remove(friendId);
176 }
177
178 public List<Integer> getSelectedFriendList()
179@@ -9015,8 +8988,7 @@
180
181 public void deselectBlock(Integer friendId)
182 {
183- if (_selectedBlocksList.contains(friendId))
184- _selectedBlocksList.remove(friendId);
185+ _selectedBlocksList.remove(friendId);
186 }
187
188 public List<Integer> getSelectedBlocksList()
189Index: aCis_gameserver/java/net/sf/l2j/gameserver/skills/conditions/ConditionElementSeed.java
190IDEA additional info:
191Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
192<+>ISO-8859-1
193===================================================================
194--- aCis_gameserver/java/net/sf/l2j/gameserver/skills/conditions/ConditionElementSeed.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
195+++ aCis_gameserver/java/net/sf/l2j/gameserver/skills/conditions/ConditionElementSeed.java (date 1579381341365)
196@@ -56,8 +56,7 @@
197 {
198 count += Seeds[i];
199 }
200- if (count < _requiredSeeds[4])
201- return false;
202+ return count >= _requiredSeeds[4];
203 }
204
205 return true;
206Index: aCis_gameserver/java/net/sf/l2j/gameserver/model/ChanceCondition.java
207IDEA additional info:
208Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
209<+>ISO-8859-1
210===================================================================
211--- aCis_gameserver/java/net/sf/l2j/gameserver/model/ChanceCondition.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
212+++ aCis_gameserver/java/net/sf/l2j/gameserver/model/ChanceCondition.java (date 1579381341004)
213@@ -23,7 +23,7 @@
214 public static final int EVT_ON_ACTION_TIME = 32768;
215 public static final int EVT_ON_EXIT = 65536;
216
217- public static enum TriggerType
218+ public enum TriggerType
219 {
220 // You hit an enemy
221 ON_HIT(1),
222@@ -62,7 +62,7 @@
223
224 private final int _mask;
225
226- private TriggerType(int mask)
227+ TriggerType(int mask)
228 {
229 _mask = mask;
230 }
231Index: aCis_gameserver/java/net/sf/l2j/gameserver/model/L2Effect.java
232IDEA additional info:
233Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
234<+>ISO-8859-1
235===================================================================
236--- aCis_gameserver/java/net/sf/l2j/gameserver/model/L2Effect.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
237+++ aCis_gameserver/java/net/sf/l2j/gameserver/model/L2Effect.java (date 1579381341062)
238@@ -30,7 +30,7 @@
239 {
240 protected static final Logger _log = Logger.getLogger(L2Effect.class.getName());
241
242- public static enum EffectState
243+ public enum EffectState
244 {
245 CREATED,
246 ACTING,
247@@ -119,7 +119,7 @@
248
249 if (_skill.getId() > 2277 && _skill.getId() < 2286)
250 {
251- if (_effected instanceof Servitor || (_effected instanceof Player && ((Player) _effected).getSummon() != null))
252+ if (_effected instanceof Servitor || (_effected instanceof Player && _effected.getSummon() != null))
253 temp /= 2;
254 }
255
256Index: aCis_gameserver/java/net/sf/l2j/gameserver/data/manager/SevenSignsManager.java
257IDEA additional info:
258Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
259<+>ISO-8859-1
260===================================================================
261--- aCis_gameserver/java/net/sf/l2j/gameserver/data/manager/SevenSignsManager.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
262+++ aCis_gameserver/java/net/sf/l2j/gameserver/data/manager/SevenSignsManager.java (date 1579381340938)
263@@ -169,11 +169,8 @@
264 }
265
266 // Because of previous "date" column usage, check only if it already contains usable data for us
267- if (_lastSave.getTimeInMillis() > 7 && _lastSave.before(lastPeriodChange))
268- return true;
269-
270- return false;
271- }
272+ return _lastSave.getTimeInMillis() > 7 && _lastSave.before(lastPeriodChange);
273+ }
274
275 /**
276 * Registers all random spawns and auto-chats for Seven Signs NPCs, along with spawns for the Preachers of Doom and Orators of Revelations at the beginning of the Seal Validation period.
277Index: aCis_gameserver/java/net/sf/l2j/gameserver/data/manager/FenceManager.java
278IDEA additional info:
279Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
280<+>ISO-8859-1
281===================================================================
282--- aCis_gameserver/java/net/sf/l2j/gameserver/data/manager/FenceManager.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
283+++ aCis_gameserver/java/net/sf/l2j/gameserver/data/manager/FenceManager.java (date 1579381340629)
284@@ -40,7 +40,7 @@
285 final int _offset;
286 final int _geoDataSize;
287
288- private FenceSize(int offset, int geoDataSize)
289+ FenceSize(int offset, int geoDataSize)
290 {
291 _offset = offset;
292 _geoDataSize = geoDataSize;
293Index: aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q645_GhostsOfBatur.java
294IDEA additional info:
295Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
296<+>ISO-8859-1
297===================================================================
298--- aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q645_GhostsOfBatur.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
299+++ aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q645_GhostsOfBatur.java (date 1579381242463)
300@@ -76,7 +76,7 @@
301 htmltext = "32017-07.htm";
302 st.takeItems(CURSED_GRAVE_GOODS, -1);
303
304- final int reward[] = REWARDS[Integer.parseInt(event)];
305+ final int[] reward = REWARDS[Integer.parseInt(event)];
306 st.giveItems(reward[0], reward[1]);
307
308 st.playSound(QuestState.SOUND_FINISH);
309Index: aCis_gameserver/java/net/sf/l2j/gameserver/enums/items/WeaponType.java
310IDEA additional info:
311Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
312<+>ISO-8859-1
313===================================================================
314--- aCis_gameserver/java/net/sf/l2j/gameserver/enums/items/WeaponType.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
315+++ aCis_gameserver/java/net/sf/l2j/gameserver/enums/items/WeaponType.java (date 1579381341562)
316@@ -22,7 +22,7 @@
317 private final int _mask;
318 private final int _range;
319
320- private WeaponType(int range)
321+ WeaponType(int range)
322 {
323 _mask = 1 << ordinal();
324 _range = range;
325Index: aCis_gameserver/java/net/sf/l2j/gameserver/enums/items/CrystalType.java
326IDEA additional info:
327Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
328<+>ISO-8859-1
329===================================================================
330--- aCis_gameserver/java/net/sf/l2j/gameserver/enums/items/CrystalType.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
331+++ aCis_gameserver/java/net/sf/l2j/gameserver/enums/items/CrystalType.java (date 1579381341175)
332@@ -14,7 +14,7 @@
333 private final int _crystalEnchantBonusArmor;
334 private final int _crystalEnchantBonusWeapon;
335
336- private CrystalType(int id, int crystalId, int crystalEnchantBonusArmor, int crystalEnchantBonusWeapon)
337+ CrystalType(int id, int crystalId, int crystalEnchantBonusArmor, int crystalEnchantBonusWeapon)
338 {
339 _id = id;
340 _crystalId = crystalId;
341Index: aCis_gameserver/java/net/sf/l2j/gameserver/enums/items/ShotType.java
342IDEA additional info:
343Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
344<+>ISO-8859-1
345===================================================================
346--- aCis_gameserver/java/net/sf/l2j/gameserver/enums/items/ShotType.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
347+++ aCis_gameserver/java/net/sf/l2j/gameserver/enums/items/ShotType.java (date 1579381340681)
348@@ -9,7 +9,7 @@
349
350 private final int _mask;
351
352- private ShotType()
353+ ShotType()
354 {
355 _mask = (1 << ordinal());
356 }
357Index: aCis_gameserver/java/net/sf/l2j/gameserver/enums/items/ArmorType.java
358IDEA additional info:
359Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
360<+>ISO-8859-1
361===================================================================
362--- aCis_gameserver/java/net/sf/l2j/gameserver/enums/items/ArmorType.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
363+++ aCis_gameserver/java/net/sf/l2j/gameserver/enums/items/ArmorType.java (date 1579381341385)
364@@ -13,7 +13,7 @@
365
366 private final int _mask;
367
368- private ArmorType()
369+ ArmorType()
370 {
371 _mask = 1 << (ordinal() + WeaponType.values().length);
372 }
373Index: aCis_gameserver/java/net/sf/l2j/gameserver/enums/items/MaterialType.java
374IDEA additional info:
375Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
376<+>ISO-8859-1
377===================================================================
378--- aCis_gameserver/java/net/sf/l2j/gameserver/enums/items/MaterialType.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
379+++ aCis_gameserver/java/net/sf/l2j/gameserver/enums/items/MaterialType.java (date 1579381341505)
380@@ -24,5 +24,5 @@
381 LIQUID,
382 SCALE_OF_DRAGON,
383 DYESTUFF,
384- COBWEB;
385+ COBWEB
386 }
387\ No newline at end of file
388Index: aCis_gameserver/java/net/sf/l2j/gameserver/enums/actors/ClassRace.java
389IDEA additional info:
390Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
391<+>ISO-8859-1
392===================================================================
393--- aCis_gameserver/java/net/sf/l2j/gameserver/enums/actors/ClassRace.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
394+++ aCis_gameserver/java/net/sf/l2j/gameserver/enums/actors/ClassRace.java (date 1579381340690)
395@@ -13,7 +13,7 @@
396
397 private final double _breathMultiplier;
398
399- private ClassRace(double breathMultiplier)
400+ ClassRace(double breathMultiplier)
401 {
402 _breathMultiplier = breathMultiplier;
403 }
404Index: aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q373_SupplierOfReagents.java
405IDEA additional info:
406Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
407<+>ISO-8859-1
408===================================================================
409--- aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q373_SupplierOfReagents.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
410+++ aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q373_SupplierOfReagents.java (date 1579381242260)
411@@ -337,7 +337,7 @@
412 st.takeItems(catalyst, 1);
413
414 int tempIndex = Integer.parseInt(event.substring(9, 10));
415- for (int temperature[] : TEMPERATURES)
416+ for (int[] temperature : TEMPERATURES)
417 {
418 if (temperature[0] != tempIndex)
419 continue;
420Index: aCis_gameserver/java/net/sf/l2j/gameserver/enums/items/ItemType.java
421IDEA additional info:
422Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
423<+>ISO-8859-1
424===================================================================
425--- aCis_gameserver/java/net/sf/l2j/gameserver/enums/items/ItemType.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
426+++ aCis_gameserver/java/net/sf/l2j/gameserver/enums/items/ItemType.java (date 1579381340700)
427@@ -2,5 +2,5 @@
428
429 public interface ItemType
430 {
431- public int mask();
432+ int mask();
433 }
434\ No newline at end of file
435Index: aCis_gameserver/java/net/sf/l2j/gameserver/enums/actors/ClassId.java
436IDEA additional info:
437Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
438<+>ISO-8859-1
439===================================================================
440--- aCis_gameserver/java/net/sf/l2j/gameserver/enums/actors/ClassId.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
441+++ aCis_gameserver/java/net/sf/l2j/gameserver/enums/actors/ClassId.java (date 1579381341048)
442@@ -180,7 +180,7 @@
443 * @param name : Class name.
444 * @param parent : Class parent.
445 */
446- private ClassId(ClassRace race, ClassType type, int level, String name, ClassId parent)
447+ ClassId(ClassRace race, ClassType type, int level, String name, ClassId parent)
448 {
449 _id = ordinal();
450 _race = race;
451Index: aCis_gameserver/java/net/sf/l2j/gameserver/network/clientpackets/SendProtocolVersion.java
452IDEA additional info:
453Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
454<+>ISO-8859-1
455===================================================================
456--- aCis_gameserver/java/net/sf/l2j/gameserver/network/clientpackets/SendProtocolVersion.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
457+++ aCis_gameserver/java/net/sf/l2j/gameserver/network/clientpackets/SendProtocolVersion.java (date 1579381340709)
458@@ -26,7 +26,7 @@
459 break;
460
461 default:
462- getClient().close((L2GameServerPacket) null);
463+ getClient().close(null);
464 break;
465 }
466 }
467Index: aCis_gameserver/java/net/sf/l2j/gameserver/model/L2Skill.java
468IDEA additional info:
469Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
470<+>ISO-8859-1
471===================================================================
472--- aCis_gameserver/java/net/sf/l2j/gameserver/model/L2Skill.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
473+++ aCis_gameserver/java/net/sf/l2j/gameserver/model/L2Skill.java (date 1579381340599)
474@@ -63,7 +63,7 @@
475 public static final int SKILL_DIVINE_INSPIRATION = 1405;
476 public static final int SKILL_NPC_RACE = 4416;
477
478- public static enum SkillOpType
479+ public enum SkillOpType
480 {
481 OP_PASSIVE,
482 OP_ACTIVE,
483@@ -71,7 +71,7 @@
484 }
485
486 /** Target types of skills : SELF, PARTY, CLAN, PET... */
487- public static enum SkillTargetType
488+ public enum SkillTargetType
489 {
490 TARGET_NONE,
491 TARGET_SELF,
492@@ -1058,9 +1058,7 @@
493
494 public final boolean is7Signs()
495 {
496- if (_id > 4360 && _id < 4367)
497- return true;
498- return false;
499+ return _id > 4360 && _id < 4367;
500 }
501
502 public final boolean isStayAfterDeath()
503@@ -1170,7 +1168,7 @@
504
505 final Item shield = activeChar.getSecondaryWeaponItem();
506 if (shield != null && shield instanceof Armor)
507- mask |= ((ArmorType) shield.getItemType()).mask();
508+ mask |= shield.getItemType().mask();
509
510 if ((mask & weaponsAllowed) != 0)
511 return true;
512@@ -2088,11 +2086,8 @@
513 {
514 if (isDead != target.isDead())
515 return false;
516-
517- if (radius > 0 && !MathUtil.checkIfInRange(radius, caster, target, true))
518- return false;
519-
520- return true;
521+
522+ return radius <= 0 || MathUtil.checkIfInRange(radius, caster, target, true);
523 }
524
525 public final List<Func> getStatFuncs(Creature player)
526@@ -2157,7 +2152,7 @@
527 if (effected.isInvul())
528 return Collections.emptyList();
529
530- if (effector instanceof Player && ((Player) effector).isGM())
531+ if (effector instanceof Player && effector.isGM())
532 {
533 if (!((Player) effector).getAccessLevel().canGiveDamage())
534 return Collections.emptyList();
535@@ -2189,7 +2184,7 @@
536 }
537 // display fail message only for effects with icons
538 else if (template.icon && effector instanceof Player)
539- ((Player) effector).sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_RESISTED_YOUR_S2).addCharName(effected).addSkillName(this));
540+ effector.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_RESISTED_YOUR_S2).addCharName(effected).addSkillName(this));
541 }
542 return effects;
543 }
544Index: aCis_gameserver/java/net/sf/l2j/gameserver/enums/actors/MoveType.java
545IDEA additional info:
546Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
547<+>ISO-8859-1
548===================================================================
549--- aCis_gameserver/java/net/sf/l2j/gameserver/enums/actors/MoveType.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
550+++ aCis_gameserver/java/net/sf/l2j/gameserver/enums/actors/MoveType.java (date 1579381341478)
551@@ -9,7 +9,7 @@
552 private final int _id;
553 private final int _mask;
554
555- private MoveType(int id)
556+ MoveType(int id)
557 {
558 _id = id;
559 _mask = (1 << ordinal());
560Index: aCis_gameserver/java/net/sf/l2j/gameserver/enums/actors/OperateType.java
561IDEA additional info:
562Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
563<+>ISO-8859-1
564===================================================================
565--- aCis_gameserver/java/net/sf/l2j/gameserver/enums/actors/OperateType.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
566+++ aCis_gameserver/java/net/sf/l2j/gameserver/enums/actors/OperateType.java (date 1579381340853)
567@@ -14,7 +14,7 @@
568
569 private int _id;
570
571- private OperateType(int id)
572+ OperateType(int id)
573 {
574 _id = id;
575 }
576Index: aCis_gameserver/java/net/sf/l2j/gameserver/enums/actors/Sex.java
577IDEA additional info:
578Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
579<+>ISO-8859-1
580===================================================================
581--- aCis_gameserver/java/net/sf/l2j/gameserver/enums/actors/Sex.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
582+++ aCis_gameserver/java/net/sf/l2j/gameserver/enums/actors/Sex.java (date 1579381340779)
583@@ -4,5 +4,5 @@
584 {
585 MALE,
586 FEMALE,
587- ETC;
588+ ETC
589 }
590\ No newline at end of file
591Index: aCis_gameserver/java/net/sf/l2j/gameserver/model/Augmentation.java
592IDEA additional info:
593Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
594<+>ISO-8859-1
595===================================================================
596--- aCis_gameserver/java/net/sf/l2j/gameserver/model/Augmentation.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
597+++ aCis_gameserver/java/net/sf/l2j/gameserver/model/Augmentation.java (date 1579381340717)
598@@ -110,8 +110,8 @@
599
600 public static class AugmentationStatBoni
601 {
602- private final Stats _stats[];
603- private final float _values[];
604+ private final Stats[] _stats;
605+ private final float[] _values;
606 private boolean _active;
607
608 public AugmentationStatBoni(int augmentationId)
609@@ -138,7 +138,7 @@
610 return;
611
612 for (int i = 0; i < _stats.length; i++)
613- ((Creature) player).addStatFunc(new FuncAdd(this, _stats[i], _values[i], null));
614+ player.addStatFunc(new FuncAdd(this, _stats[i], _values[i], null));
615
616 _active = true;
617 }
618@@ -149,7 +149,7 @@
619 if (!_active)
620 return;
621
622- ((Creature) player).removeStatsByOwner(this);
623+ player.removeStatsByOwner(this);
624
625 _active = false;
626 }
627Index: aCis_gameserver/java/net/sf/l2j/gameserver/enums/skills/Stats.java
628IDEA additional info:
629Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
630<+>ISO-8859-1
631===================================================================
632--- aCis_gameserver/java/net/sf/l2j/gameserver/enums/skills/Stats.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
633+++ aCis_gameserver/java/net/sf/l2j/gameserver/enums/skills/Stats.java (date 1579381341358)
634@@ -173,7 +173,7 @@
635 return _value;
636 }
637
638- private Stats(String s)
639+ Stats(String s)
640 {
641 _value = s;
642 }
643Index: aCis_gameserver/java/net/sf/l2j/gameserver/enums/skills/L2SkillType.java
644IDEA additional info:
645Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
646<+>ISO-8859-1
647===================================================================
648--- aCis_gameserver/java/net/sf/l2j/gameserver/enums/skills/L2SkillType.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
649+++ aCis_gameserver/java/net/sf/l2j/gameserver/enums/skills/L2SkillType.java (date 1579381341294)
650@@ -163,12 +163,12 @@
651 }
652 }
653
654- private L2SkillType()
655+ L2SkillType()
656 {
657 _class = L2SkillDefault.class;
658 }
659
660- private L2SkillType(Class<? extends L2Skill> classType)
661+ L2SkillType(Class<? extends L2Skill> classType)
662 {
663 _class = classType;
664 }
665Index: aCis_gameserver/java/net/sf/l2j/gameserver/enums/skills/AbnormalEffect.java
666IDEA additional info:
667Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
668<+>ISO-8859-1
669===================================================================
670--- aCis_gameserver/java/net/sf/l2j/gameserver/enums/skills/AbnormalEffect.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
671+++ aCis_gameserver/java/net/sf/l2j/gameserver/enums/skills/AbnormalEffect.java (date 1579381340896)
672@@ -33,7 +33,7 @@
673 private final int _mask;
674 private final String _name;
675
676- private AbnormalEffect(String name, int mask)
677+ AbnormalEffect(String name, int mask)
678 {
679 _name = name;
680 _mask = mask;
681Index: aCis_gameserver/java/net/sf/l2j/gameserver/model/olympiad/OlympiadGameNormal.java
682IDEA additional info:
683Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
684<+>ISO-8859-1
685===================================================================
686--- aCis_gameserver/java/net/sf/l2j/gameserver/model/olympiad/OlympiadGameNormal.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
687+++ aCis_gameserver/java/net/sf/l2j/gameserver/model/olympiad/OlympiadGameNormal.java (date 1579381341123)
688@@ -219,12 +219,9 @@
689
690 if (_playerOne.getPlayer() == null || _playerOne.isDisconnected())
691 return false;
692-
693- if (_playerTwo.getPlayer() == null || _playerTwo.isDisconnected())
694- return false;
695-
696- return true;
697- }
698+
699+ return _playerTwo.getPlayer() != null && !_playerTwo.isDisconnected();
700+ }
701
702 @Override
703 protected final boolean haveWinner()
704Index: aCis_gameserver/java/net/sf/l2j/gameserver/model/olympiad/OlympiadGameTask.java
705IDEA additional info:
706Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
707<+>ISO-8859-1
708===================================================================
709--- aCis_gameserver/java/net/sf/l2j/gameserver/model/olympiad/OlympiadGameTask.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
710+++ aCis_gameserver/java/net/sf/l2j/gameserver/model/olympiad/OlympiadGameTask.java (date 1579381341839)
711@@ -64,7 +64,7 @@
712 private boolean _needAnnounce = false;
713 private int _countDown = 0;
714
715- private static enum GameState
716+ private enum GameState
717 {
718 BEGIN,
719 TELE_TO_ARENA,
720Index: aCis_gameserver/java/net/sf/l2j/gameserver/enums/OlympiadType.java
721IDEA additional info:
722Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
723<+>ISO-8859-1
724===================================================================
725--- aCis_gameserver/java/net/sf/l2j/gameserver/enums/OlympiadType.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
726+++ aCis_gameserver/java/net/sf/l2j/gameserver/enums/OlympiadType.java (date 1579381340905)
727@@ -7,7 +7,7 @@
728
729 private final String _name;
730
731- private OlympiadType(String name)
732+ OlympiadType(String name)
733 {
734 _name = name;
735 }
736Index: aCis_gameserver/java/net/sf/l2j/gameserver/model/item/ArmorSet.java
737IDEA additional info:
738Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
739<+>ISO-8859-1
740===================================================================
741--- aCis_gameserver/java/net/sf/l2j/gameserver/model/item/ArmorSet.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
742+++ aCis_gameserver/java/net/sf/l2j/gameserver/model/item/ArmorSet.java (date 1579381340882)
743@@ -103,12 +103,9 @@
744 final ItemInstance feetItem = inv.getPaperdollItem(Inventory.PAPERDOLL_FEET);
745 if (feetItem != null)
746 feet = feetItem.getItemId();
747-
748- if (_set[4] != 0 && _set[4] != feet)
749- return false;
750-
751- return true;
752- }
753+
754+ return _set[4] == 0 || _set[4] == feet;
755+ }
756
757 public boolean containItem(int slot, int itemId)
758 {
759@@ -137,11 +134,8 @@
760 public boolean containShield(Player player)
761 {
762 final ItemInstance shieldItem = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND);
763- if (shieldItem != null && shieldItem.getItemId() == _shield)
764- return true;
765-
766- return false;
767- }
768+ return shieldItem != null && shieldItem.getItemId() == _shield;
769+ }
770
771 public boolean containShield(int shieldId)
772 {
773@@ -193,10 +187,7 @@
774 final ItemInstance feetItem = inv.getPaperdollItem(Inventory.PAPERDOLL_FEET);
775 if (feetItem != null && feetItem.getEnchantLevel() > 5)
776 feet = feetItem.getItemId();
777-
778- if (_set[4] != 0 && _set[4] != feet)
779- return false;
780-
781- return true;
782- }
783+
784+ return _set[4] == 0 || _set[4] == feet;
785+ }
786 }
787\ No newline at end of file
788Index: aCis_gameserver/java/net/sf/l2j/gameserver/enums/CabalType.java
789IDEA additional info:
790Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
791<+>ISO-8859-1
792===================================================================
793--- aCis_gameserver/java/net/sf/l2j/gameserver/enums/CabalType.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
794+++ aCis_gameserver/java/net/sf/l2j/gameserver/enums/CabalType.java (date 1579381340590)
795@@ -9,7 +9,7 @@
796 private final String _shortName;
797 private final String _fullName;
798
799- private CabalType(String shortName, String fullName)
800+ CabalType(String shortName, String fullName)
801 {
802 _shortName = shortName;
803 _fullName = fullName;
804Index: aCis_gameserver/java/net/sf/l2j/gameserver/model/multisell/PreparedListContainer.java
805IDEA additional info:
806Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
807<+>ISO-8859-1
808===================================================================
809--- aCis_gameserver/java/net/sf/l2j/gameserver/model/multisell/PreparedListContainer.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
810+++ aCis_gameserver/java/net/sf/l2j/gameserver/model/multisell/PreparedListContainer.java (date 1579381341415)
811@@ -83,6 +83,6 @@
812
813 public final boolean checkNpcObjectId(int npcObjectId)
814 {
815- return (_npcObjectId != 0) ? _npcObjectId == npcObjectId : true;
816+ return (_npcObjectId == 0) || _npcObjectId == npcObjectId;
817 }
818 }
819\ No newline at end of file
820Index: aCis_gameserver/java/net/sf/l2j/gameserver/scripting/scripts/ai/group/PlainsOfDion.java
821IDEA additional info:
822Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
823<+>ISO-8859-1
824===================================================================
825--- aCis_gameserver/java/net/sf/l2j/gameserver/scripting/scripts/ai/group/PlainsOfDion.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
826+++ aCis_gameserver/java/net/sf/l2j/gameserver/scripting/scripts/ai/group/PlainsOfDion.java (date 1579381242147)
827@@ -14,7 +14,7 @@
828 */
829 public final class PlainsOfDion extends L2AttackableAIScript
830 {
831- private static final int MONSTERS[] =
832+ private static final int[] MONSTERS =
833 {
834 21104, // Delu Lizardman Supplier
835 21105, // Delu Lizardman Special Agent
836Index: aCis_gameserver/java/net/sf/l2j/gameserver/enums/BossInfoType.java
837IDEA additional info:
838Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
839<+>ISO-8859-1
840===================================================================
841--- aCis_gameserver/java/net/sf/l2j/gameserver/enums/BossInfoType.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
842+++ aCis_gameserver/java/net/sf/l2j/gameserver/enums/BossInfoType.java (date 1579381340797)
843@@ -23,7 +23,7 @@
844 private final String _ccNoRightsMsg;
845 private final int _requiredMembersAmount;
846
847- private BossInfoType(int npcId, String ccRightsMsg, String ccNoRightsMsg, int requiredMembersAmount)
848+ BossInfoType(int npcId, String ccRightsMsg, String ccNoRightsMsg, int requiredMembersAmount)
849 {
850 _npcId = npcId;
851 _ccRightsMsg = ccRightsMsg;
852Index: aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q644_GraveRobberAnnihilation.java
853IDEA additional info:
854Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
855<+>ISO-8859-1
856===================================================================
857--- aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q644_GraveRobberAnnihilation.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
858+++ aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q644_GraveRobberAnnihilation.java (date 1579381242223)
859@@ -78,7 +78,7 @@
860 htmltext = "32017-04.htm";
861 st.takeItems(ORC_GRAVE_GOODS, -1);
862
863- final int reward[] = REWARDS[Integer.parseInt(event)];
864+ final int[] reward = REWARDS[Integer.parseInt(event)];
865 st.rewardItems(reward[0], reward[1]);
866
867 st.playSound(QuestState.SOUND_FINISH);
868Index: aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q625_TheFinestIngredients_Part2.java
869IDEA additional info:
870Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
871<+>ISO-8859-1
872===================================================================
873--- aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q625_TheFinestIngredients_Part2.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
874+++ aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q625_TheFinestIngredients_Part2.java (date 1579381242092)
875@@ -27,7 +27,7 @@
876 private static final int SOY_SAUCE_JAR = 7205;
877 private static final int FOOD_FOR_BUMBALUMP = 7209;
878 private static final int SPECIAL_YETI_MEAT = 7210;
879- private static final int REWARDS[] =
880+ private static final int[] REWARDS =
881 {
882 4589,
883 4590,
884Index: aCis_gameserver/java/net/sf/l2j/gameserver/enums/FestivalType.java
885IDEA additional info:
886Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
887<+>ISO-8859-1
888===================================================================
889--- aCis_gameserver/java/net/sf/l2j/gameserver/enums/FestivalType.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
890+++ aCis_gameserver/java/net/sf/l2j/gameserver/enums/FestivalType.java (date 1579381341777)
891@@ -12,7 +12,7 @@
892 private final String _name;
893 private final int _maxLevel;
894
895- private FestivalType(int maxScore, String name, int maxLevel)
896+ FestivalType(int maxScore, String name, int maxLevel)
897 {
898 _maxScore = maxScore;
899 _name = name;
900Index: aCis_gameserver/java/net/sf/l2j/gameserver/enums/PolyType.java
901IDEA additional info:
902Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
903<+>ISO-8859-1
904===================================================================
905--- aCis_gameserver/java/net/sf/l2j/gameserver/enums/PolyType.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
906+++ aCis_gameserver/java/net/sf/l2j/gameserver/enums/PolyType.java (date 1579381341726)
907@@ -4,5 +4,5 @@
908 {
909 ITEM,
910 NPC,
911- DEFAULT;
912+ DEFAULT
913 }
914\ No newline at end of file
915Index: aCis_gameserver/java/net/sf/l2j/gameserver/enums/GeoType.java
916IDEA additional info:
917Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
918<+>ISO-8859-1
919===================================================================
920--- aCis_gameserver/java/net/sf/l2j/gameserver/enums/GeoType.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
921+++ aCis_gameserver/java/net/sf/l2j/gameserver/enums/GeoType.java (date 1579381341072)
922@@ -8,7 +8,7 @@
923
924 private final String _filename;
925
926- private GeoType(String filename)
927+ GeoType(String filename)
928 {
929 _filename = filename;
930 }
931Index: aCis_gameserver/java/net/sf/l2j/gameserver/model/item/instance/ItemInstance.java
932IDEA additional info:
933Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
934<+>ISO-8859-1
935===================================================================
936--- aCis_gameserver/java/net/sf/l2j/gameserver/model/item/instance/ItemInstance.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
937+++ aCis_gameserver/java/net/sf/l2j/gameserver/model/item/instance/ItemInstance.java (date 1579381341821)
938@@ -62,7 +62,7 @@
939
940 private static final String DELETE_PET_ITEM = "DELETE FROM pets WHERE item_obj_id=?";
941
942- public static enum ItemState
943+ public enum ItemState
944 {
945 UNCHANGED,
946 ADDED,
947@@ -70,7 +70,7 @@
948 REMOVED
949 }
950
951- public static enum ItemLocation
952+ public enum ItemLocation
953 {
954 VOID,
955 INVENTORY,
956@@ -511,7 +511,7 @@
957 */
958 public boolean isDropable()
959 {
960- return isAugmented() ? false : _item.isDropable();
961+ return !isAugmented() && _item.isDropable();
962 }
963
964 /**
965@@ -519,7 +519,7 @@
966 */
967 public boolean isDestroyable()
968 {
969- return isQuestItem() ? false : _item.isDestroyable();
970+ return !isQuestItem() && _item.isDestroyable();
971 }
972
973 /**
974@@ -527,7 +527,7 @@
975 */
976 public boolean isTradable()
977 {
978- return isAugmented() ? false : _item.isTradable();
979+ return !isAugmented() && _item.isTradable();
980 }
981
982 /**
983@@ -535,7 +535,7 @@
984 */
985 public boolean isSellable()
986 {
987- return isAugmented() ? false : _item.isSellable();
988+ return !isAugmented() && _item.isSellable();
989 }
990
991 /**
992@@ -551,8 +551,7 @@
993 if (!isPrivateWareHouse)
994 {
995 // augmented not tradable
996- if (!isTradable() || isShadowItem())
997- return false;
998+ return isTradable() && !isShadowItem();
999 }
1000 return true;
1001 }
1002Index: aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q386_StolenDignity.java
1003IDEA additional info:
1004Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1005<+>ISO-8859-1
1006===================================================================
1007--- aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q386_StolenDignity.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1008+++ aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q386_StolenDignity.java (date 1579381242243)
1009@@ -137,13 +137,13 @@
1010
1011 // Verify if the given number is already on the player array, if yes, it's invalid, otherwise register it.
1012 if (playerArray.contains(number))
1013- htmltext = fillBoard(st, getHtmlText("30843-" + String.valueOf(13 + 2 * playerArray.length()) + ".htm"));
1014+ htmltext = fillBoard(st, getHtmlText("30843-" + (13 + 2 * playerArray.length()) + ".htm"));
1015 else
1016 {
1017 // Stores the final String.
1018 st.set("playerArray", playerArray.concat(number));
1019
1020- htmltext = fillBoard(st, getHtmlText("30843-" + String.valueOf(12 + 2 * playerArray.length()) + ".htm"));
1021+ htmltext = fillBoard(st, getHtmlText("30843-" + (12 + 2 * playerArray.length()) + ".htm"));
1022 }
1023 }
1024 else if (event.startsWith("select_3-")) // pick #6
1025Index: aCis_gameserver/java/net/sf/l2j/gameserver/enums/SealType.java
1026IDEA additional info:
1027Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1028<+>ISO-8859-1
1029===================================================================
1030--- aCis_gameserver/java/net/sf/l2j/gameserver/enums/SealType.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1031+++ aCis_gameserver/java/net/sf/l2j/gameserver/enums/SealType.java (date 1579381341430)
1032@@ -10,7 +10,7 @@
1033 private final String _shortName;
1034 private final String _fullName;
1035
1036- private SealType(String shortName, String fullName)
1037+ SealType(String shortName, String fullName)
1038 {
1039 _shortName = shortName;
1040 _fullName = fullName;
1041Index: aCis_gameserver/java/net/sf/l2j/gameserver/scripting/scripts/ai/individual/Baium.java
1042IDEA additional info:
1043Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1044<+>ISO-8859-1
1045===================================================================
1046--- aCis_gameserver/java/net/sf/l2j/gameserver/scripting/scripts/ai/individual/Baium.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1047+++ aCis_gameserver/java/net/sf/l2j/gameserver/scripting/scripts/ai/individual/Baium.java (date 1579381242275)
1048@@ -370,10 +370,10 @@
1049 if (obj.isDead() || !(GeoEngine.getInstance().canSeeTarget(npc, obj)))
1050 continue;
1051
1052- if (((Player) obj).isGM() && !((Player) obj).getAppearance().isVisible())
1053+ if (obj.isGM() && !((Player) obj).getAppearance().isVisible())
1054 continue;
1055
1056- if (npcId == ARCHANGEL && ((Player) obj).getActiveWeaponInstance() == null)
1057+ if (npcId == ARCHANGEL && obj.getActiveWeaponInstance() == null)
1058 continue;
1059
1060 result.add(obj);
1061Index: aCis_gameserver/java/net/sf/l2j/gameserver/model/itemcontainer/listeners/OnEquipListener.java
1062IDEA additional info:
1063Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1064<+>ISO-8859-1
1065===================================================================
1066--- aCis_gameserver/java/net/sf/l2j/gameserver/model/itemcontainer/listeners/OnEquipListener.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1067+++ aCis_gameserver/java/net/sf/l2j/gameserver/model/itemcontainer/listeners/OnEquipListener.java (date 1579381340756)
1068@@ -5,7 +5,7 @@
1069
1070 public interface OnEquipListener
1071 {
1072- public void onEquip(int slot, ItemInstance item, Playable actor);
1073+ void onEquip(int slot, ItemInstance item, Playable actor);
1074
1075- public void onUnequip(int slot, ItemInstance item, Playable actor);
1076+ void onUnequip(int slot, ItemInstance item, Playable actor);
1077 }
1078\ No newline at end of file
1079Index: aCis_gameserver/java/net/sf/l2j/gameserver/enums/PeriodType.java
1080IDEA additional info:
1081Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1082<+>ISO-8859-1
1083===================================================================
1084--- aCis_gameserver/java/net/sf/l2j/gameserver/enums/PeriodType.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1085+++ aCis_gameserver/java/net/sf/l2j/gameserver/enums/PeriodType.java (date 1579381341639)
1086@@ -12,7 +12,7 @@
1087 private final String _name;
1088 private final SystemMessageId _smId;
1089
1090- private PeriodType(String name, SystemMessageId smId)
1091+ PeriodType(String name, SystemMessageId smId)
1092 {
1093 _name = name;
1094 _smId = smId;
1095Index: aCis_gameserver/java/net/sf/l2j/gameserver/network/clientpackets/RequestActionUse.java
1096IDEA additional info:
1097Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1098<+>ISO-8859-1
1099===================================================================
1100--- aCis_gameserver/java/net/sf/l2j/gameserver/network/clientpackets/RequestActionUse.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1101+++ aCis_gameserver/java/net/sf/l2j/gameserver/network/clientpackets/RequestActionUse.java (date 1579381341337)
1102@@ -190,7 +190,7 @@
1103
1104 if (target instanceof Door)
1105 {
1106- if (((Door) target).isAutoAttackable(player) && summon.getNpcId() != SiegeSummon.SWOOP_CANNON_ID)
1107+ if (target.isAutoAttackable(player) && summon.getNpcId() != SiegeSummon.SWOOP_CANNON_ID)
1108 summon.getAI().setIntention(IntentionType.ATTACK, target);
1109 }
1110 // siege golem AI doesn't support attacking other than doors at the moment
1111Index: aCis_gameserver/java/net/sf/l2j/gameserver/enums/ScheduleType.java
1112IDEA additional info:
1113Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1114<+>ISO-8859-1
1115===================================================================
1116--- aCis_gameserver/java/net/sf/l2j/gameserver/enums/ScheduleType.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1117+++ aCis_gameserver/java/net/sf/l2j/gameserver/enums/ScheduleType.java (date 1579381341448)
1118@@ -17,7 +17,7 @@
1119
1120 private final int _period;
1121
1122- private ScheduleType(int period)
1123+ ScheduleType(int period)
1124 {
1125 _period = period;
1126 }
1127Index: aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q385_YokeOfThePast.java
1128IDEA additional info:
1129Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1130<+>ISO-8859-1
1131===================================================================
1132--- aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q385_YokeOfThePast.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1133+++ aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q385_YokeOfThePast.java (date 1579381242481)
1134@@ -14,7 +14,7 @@
1135 private static final String qn = "Q385_YokeOfThePast";
1136
1137 // NPCs
1138- private static final int GATEKEEPER_ZIGGURAT[] =
1139+ private static final int[] GATEKEEPER_ZIGGURAT =
1140 {
1141 31095,
1142 31096,
1143Index: aCis_gameserver/java/net/sf/l2j/gameserver/model/zone/form/ZoneCylinder.java
1144IDEA additional info:
1145Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1146<+>ISO-8859-1
1147===================================================================
1148--- aCis_gameserver/java/net/sf/l2j/gameserver/model/zone/form/ZoneCylinder.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1149+++ aCis_gameserver/java/net/sf/l2j/gameserver/model/zone/form/ZoneCylinder.java (date 1579381341248)
1150@@ -19,11 +19,8 @@
1151 @Override
1152 public boolean isInsideZone(int x, int y, int z)
1153 {
1154- if ((Math.pow(_x - x, 2) + Math.pow(_y - y, 2)) > _radS || z < _z1 || z > _z2)
1155- return false;
1156-
1157- return true;
1158- }
1159+ return !((Math.pow(_x - x, 2) + Math.pow(_y - y, 2)) > _radS) && z >= _z1 && z <= _z2;
1160+ }
1161
1162 @Override
1163 public boolean intersectsRectangle(int ax1, int ax2, int ay1, int ay2)
1164@@ -59,9 +56,8 @@
1165 {
1166 if (Math.abs(_x - ax2) < _rad)
1167 return true;
1168-
1169- if (Math.abs(_x - ax1) < _rad)
1170- return true;
1171+
1172+ return Math.abs(_x - ax1) < _rad;
1173 }
1174
1175 return false;
1176Index: aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q509_TheClansPrestige.java
1177IDEA additional info:
1178Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1179<+>ISO-8859-1
1180===================================================================
1181--- aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q509_TheClansPrestige.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1182+++ aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q509_TheClansPrestige.java (date 1579381242498)
1183@@ -35,7 +35,7 @@
1184 private static final int QUEEN_SHYEED = 25514;
1185
1186 // Reward list (itemId, minClanPoints, maxClanPoints)
1187- private static final int reward_list[][] =
1188+ private static final int[][] reward_list =
1189 {
1190 {
1191 DAIMON_THE_WHITE_EYED,
1192@@ -70,7 +70,7 @@
1193 };
1194
1195 // Radar
1196- private static final int radar[][] =
1197+ private static final int[][] radar =
1198 {
1199 {
1200 186320,
1201Index: aCis_gameserver/java/net/sf/l2j/gameserver/model/zone/form/ZoneCuboid.java
1202IDEA additional info:
1203Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1204<+>ISO-8859-1
1205===================================================================
1206--- aCis_gameserver/java/net/sf/l2j/gameserver/model/zone/form/ZoneCuboid.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1207+++ aCis_gameserver/java/net/sf/l2j/gameserver/model/zone/form/ZoneCuboid.java (date 1579381340975)
1208@@ -42,11 +42,8 @@
1209 @Override
1210 public boolean isInsideZone(int x, int y, int z)
1211 {
1212- if (x < _x1 || x > _x2 || y < _y1 || y > _y2 || z < _z1 || z > _z2)
1213- return false;
1214-
1215- return true;
1216- }
1217+ return x >= _x1 && x <= _x2 && y >= _y1 && y <= _y2 && z >= _z1 && z <= _z2;
1218+ }
1219
1220 @Override
1221 public boolean intersectsRectangle(int ax1, int ax2, int ay1, int ay2)
1222@@ -99,12 +96,9 @@
1223
1224 if (lineSegmentsIntersect(_x2, _y1, _x2, _y2, ax1, ay1, ax2, ay1))
1225 return true;
1226-
1227- if (lineSegmentsIntersect(_x2, _y1, _x2, _y2, ax1, ay2, ax2, ay2))
1228- return true;
1229-
1230- return false;
1231- }
1232+
1233+ return lineSegmentsIntersect(_x2, _y1, _x2, _y2, ax1, ay2, ax2, ay2);
1234+ }
1235
1236 @Override
1237 public double getDistanceToZone(int x, int y)
1238Index: aCis_gameserver/java/net/sf/l2j/gameserver/enums/LootRule.java
1239IDEA additional info:
1240Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1241<+>ISO-8859-1
1242===================================================================
1243--- aCis_gameserver/java/net/sf/l2j/gameserver/enums/LootRule.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1244+++ aCis_gameserver/java/net/sf/l2j/gameserver/enums/LootRule.java (date 1579381341716)
1245@@ -12,7 +12,7 @@
1246
1247 private final SystemMessageId _smId;
1248
1249- private LootRule(SystemMessageId smId)
1250+ LootRule(SystemMessageId smId)
1251 {
1252 _smId = smId;
1253 }
1254Index: aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q640_TheZeroHour.java
1255IDEA additional info:
1256Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1257<+>ISO-8859-1
1258===================================================================
1259--- aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q640_TheZeroHour.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1260+++ aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q640_TheZeroHour.java (date 1579381242110)
1261@@ -106,7 +106,7 @@
1262 }
1263 else if (StringUtil.isDigit(event))
1264 {
1265- int reward[] = REWARDS[Integer.parseInt(event)];
1266+ int[] reward = REWARDS[Integer.parseInt(event)];
1267
1268 if (st.getQuestItemsCount(FANG_OF_STAKATO) >= reward[0])
1269 {
1270Index: aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q359_ForSleeplessDeadmen.java
1271IDEA additional info:
1272Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1273<+>ISO-8859-1
1274===================================================================
1275--- aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q359_ForSleeplessDeadmen.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1276+++ aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q359_ForSleeplessDeadmen.java (date 1579381242288)
1277@@ -24,7 +24,7 @@
1278 private static final int DOOM_ARCHER = 21008;
1279
1280 // Reward
1281- private static final int REWARDS[] =
1282+ private static final int[] REWARDS =
1283 {
1284 6341,
1285 6342,
1286Index: aCis_gameserver/java/net/sf/l2j/gameserver/enums/TeamType.java
1287IDEA additional info:
1288Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1289<+>ISO-8859-1
1290===================================================================
1291--- aCis_gameserver/java/net/sf/l2j/gameserver/enums/TeamType.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1292+++ aCis_gameserver/java/net/sf/l2j/gameserver/enums/TeamType.java (date 1579381341769)
1293@@ -8,7 +8,7 @@
1294
1295 private int _id;
1296
1297- private TeamType(int id)
1298+ TeamType(int id)
1299 {
1300 _id = id;
1301 }
1302Index: aCis_gameserver/java/net/sf/l2j/gameserver/enums/ZoneId.java
1303IDEA additional info:
1304Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1305<+>ISO-8859-1
1306===================================================================
1307--- aCis_gameserver/java/net/sf/l2j/gameserver/enums/ZoneId.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1308+++ aCis_gameserver/java/net/sf/l2j/gameserver/enums/ZoneId.java (date 1579381341692)
1309@@ -25,7 +25,7 @@
1310
1311 private final int _id;
1312
1313- private ZoneId(int id)
1314+ ZoneId(int id)
1315 {
1316 _id = id;
1317 }
1318Index: aCis_gameserver/java/net/sf/l2j/gameserver/data/SkillTable.java
1319IDEA additional info:
1320Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1321<+>ISO-8859-1
1322===================================================================
1323--- aCis_gameserver/java/net/sf/l2j/gameserver/data/SkillTable.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1324+++ aCis_gameserver/java/net/sf/l2j/gameserver/data/SkillTable.java (date 1579381341261)
1325@@ -170,7 +170,7 @@
1326 * Enum to hold some important references to frequently used (hardcoded) skills in core
1327 * @author DrHouse
1328 */
1329- public static enum FrequentSkill
1330+ public enum FrequentSkill
1331 {
1332 LUCKY(194, 1),
1333 BLESSING_OF_PROTECTION(5182, 1),
1334@@ -231,7 +231,7 @@
1335 protected final int _level;
1336 protected L2Skill _skill = null;
1337
1338- private FrequentSkill(int id, int level)
1339+ FrequentSkill(int id, int level)
1340 {
1341 _id = id;
1342 _level = level;
1343Index: aCis_gameserver/java/net/sf/l2j/gameserver/model/zone/type/BossZone.java
1344IDEA additional info:
1345Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1346<+>ISO-8859-1
1347===================================================================
1348--- aCis_gameserver/java/net/sf/l2j/gameserver/model/zone/type/BossZone.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1349+++ aCis_gameserver/java/net/sf/l2j/gameserver/model/zone/type/BossZone.java (date 1579381341085)
1350@@ -191,8 +191,7 @@
1351 final int playerId = player.getObjectId();
1352
1353 // Allow player entry.
1354- if (!_allowedPlayers.contains(playerId))
1355- _allowedPlayers.add(playerId);
1356+ _allowedPlayers.add(playerId);
1357
1358 // For the given duration.
1359 _allowedPlayersEntryTime.put(playerId, System.currentTimeMillis() + duration * 1000);
1360@@ -205,8 +204,7 @@
1361 public void allowPlayerEntry(int playerId)
1362 {
1363 // Allow player entry.
1364- if (!_allowedPlayers.contains(playerId))
1365- _allowedPlayers.add(playerId);
1366+ _allowedPlayers.add(playerId);
1367
1368 // For the given duration.
1369 _allowedPlayersEntryTime.put(playerId, System.currentTimeMillis() + _invadeTime);
1370Index: aCis_gameserver/java/net/sf/l2j/gameserver/network/clientpackets/AbstractRefinePacket.java
1371IDEA additional info:
1372Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1373<+>ISO-8859-1
1374===================================================================
1375--- aCis_gameserver/java/net/sf/l2j/gameserver/network/clientpackets/AbstractRefinePacket.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1376+++ aCis_gameserver/java/net/sf/l2j/gameserver/network/clientpackets/AbstractRefinePacket.java (date 1579381341859)
1377@@ -137,11 +137,8 @@
1378 if (getGemStoneId(grade) != gemStones.getItemId())
1379 return false;
1380 // Count must be greater or equal of required number
1381- if (getGemStoneCount(grade) > gemStones.getCount())
1382- return false;
1383-
1384- return true;
1385- }
1386+ return getGemStoneCount(grade) <= gemStones.getCount();
1387+ }
1388
1389 /**
1390 * Checks augmentation process.
1391@@ -168,11 +165,8 @@
1392 return false;
1393
1394 // check for level of the lifestone
1395- if (player.getLevel() < ls.getPlayerLevel())
1396- return false;
1397-
1398- return true;
1399- }
1400+ return player.getLevel() >= ls.getPlayerLevel();
1401+ }
1402
1403 /*
1404 * Check both player and source item conditions for augmentation process
1405@@ -260,11 +254,8 @@
1406 }
1407 if (player.isCursedWeaponEquipped())
1408 return false;
1409- if (player.isProcessingTransaction())
1410- return false;
1411-
1412- return true;
1413- }
1414+ return !player.isProcessingTransaction();
1415+ }
1416
1417 /*
1418 * Returns GemStone itemId based on item grade
1419Index: aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q220_TestimonyOfGlory.java
1420IDEA additional info:
1421Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1422<+>ISO-8859-1
1423===================================================================
1424--- aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q220_TestimonyOfGlory.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1425+++ aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q220_TestimonyOfGlory.java (date 1579381242306)
1426@@ -672,10 +672,7 @@
1427 {
1428 _enkuOrcOverlords.remove(npc);
1429 }
1430- else if (_makumBugbearThugs.contains(npc))
1431- {
1432- _makumBugbearThugs.remove(npc);
1433- }
1434+ else _makumBugbearThugs.remove(npc);
1435
1436 return null;
1437 }
1438Index: aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q038_DragonFangs.java
1439IDEA additional info:
1440Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1441<+>ISO-8859-1
1442===================================================================
1443--- aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q038_DragonFangs.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1444+++ aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q038_DragonFangs.java (date 1579381242129)
1445@@ -28,7 +28,7 @@
1446 private static final int ROHMER = 30344;
1447
1448 // Reward { item, adena }
1449- private static final int REWARD[][] =
1450+ private static final int[][] REWARD =
1451 {
1452 {
1453 45,
1454@@ -231,7 +231,7 @@
1455 if (st == null)
1456 return null;
1457
1458- final int droplist[] = DROPLIST.get(npc.getNpcId());
1459+ final int[] droplist = DROPLIST.get(npc.getNpcId());
1460
1461 if (st.getInt("cond") == droplist[0] && st.dropItems(droplist[1], 1, droplist[2], droplist[3]))
1462 st.set("cond", String.valueOf(droplist[0] + 1));
1463Index: aCis_gameserver/java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminAdmin.java
1464IDEA additional info:
1465Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1466<+>ISO-8859-1
1467===================================================================
1468--- aCis_gameserver/java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminAdmin.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1469+++ aCis_gameserver/java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminAdmin.java (date 1579381341787)
1470@@ -256,7 +256,7 @@
1471 {
1472 if (target instanceof Player)
1473 {
1474- if (!((Player) target).isGM())
1475+ if (!target.isGM())
1476 target.stopAllEffects(); // e.g. invincibility effect
1477 target.reduceCurrentHp(target.getMaxHp() + target.getMaxCp() + 1, player, null);
1478 }
1479Index: aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/Npc.java
1480IDEA additional info:
1481Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1482<+>ISO-8859-1
1483===================================================================
1484--- aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/Npc.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1485+++ aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/Npc.java (date 1579381340665)
1486@@ -725,11 +725,8 @@
1487 return true;
1488
1489 // Test ClanHall / SiegableHall ownership.
1490- if (_clanHall != null && _clanHall.getOwnerId() == player.getClanId())
1491- return true;
1492-
1493- return false;
1494- }
1495+ return _clanHall != null && _clanHall.getOwnerId() == player.getClanId();
1496+ }
1497
1498 /**
1499 * @return the Exp reward of this {@link Npc} based on its {@link NpcTemplate} and modified by {@link Config#RATE_XP}.
1500Index: aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/Summon.java
1501IDEA additional info:
1502Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1503<+>ISO-8859-1
1504===================================================================
1505--- aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/Summon.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1506+++ aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/Summon.java (date 1579381340522)
1507@@ -200,7 +200,7 @@
1508 {
1509 html.replace("%inv%", " <a action=\"bypass admin_show_pet_inv " + getActingPlayer().getObjectId() + "\">view</a>");
1510 html.replace("%food%", ((Pet) this).getCurrentFed() + "/" + ((Pet) this).getPetData().getMaxMeal());
1511- html.replace("%load%", ((Pet) this).getInventory().getTotalWeight() + "/" + ((Pet) this).getMaxLoad());
1512+ html.replace("%load%", this.getInventory().getTotalWeight() + "/" + this.getMaxLoad());
1513 }
1514 else
1515 {
1516@@ -434,7 +434,7 @@
1517 @Override
1518 public boolean isInParty()
1519 {
1520- return (_owner == null) ? false : _owner.getParty() != null;
1521+ return (_owner != null) && _owner.getParty() != null;
1522 }
1523
1524 /**
1525@@ -557,7 +557,7 @@
1526 // Check if the target is attackable
1527 if (target instanceof Door)
1528 {
1529- if (!((Door) target).isAutoAttackable(getOwner()))
1530+ if (!target.isAutoAttackable(getOwner()))
1531 return false;
1532 }
1533 else
1534@@ -668,7 +668,7 @@
1535 @Override
1536 public boolean isInCombat()
1537 {
1538- return getOwner() != null ? getOwner().isInCombat() : false;
1539+ return getOwner() != null && getOwner().isInCombat();
1540 }
1541
1542 @Override
1543Index: aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/Playable.java
1544IDEA additional info:
1545Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1546<+>ISO-8859-1
1547===================================================================
1548--- aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/Playable.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1549+++ aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/Playable.java (date 1579381340819)
1550@@ -181,12 +181,9 @@
1551 final Player targetPlayer = target.getActingPlayer();
1552 if (targetPlayer == null || targetPlayer == this)
1553 return false;
1554-
1555- if (targetPlayer.getKarma() != 0 || targetPlayer.getPvpFlag() == 0)
1556- return false;
1557-
1558- return true;
1559- }
1560+
1561+ return targetPlayer.getKarma() == 0 && targetPlayer.getPvpFlag() != 0;
1562+ }
1563
1564 /**
1565 * Return True.
1566Index: aCis_gameserver/java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminPForge.java
1567IDEA additional info:
1568Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1569<+>ISO-8859-1
1570===================================================================
1571--- aCis_gameserver/java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminPForge.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1572+++ aCis_gameserver/java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminPForge.java (date 1579381340574)
1573@@ -87,7 +87,7 @@
1574 }
1575 else if (val.toLowerCase().equals("$tclanid"))
1576 {
1577- val = String.valueOf(((Player) activeChar.getTarget()).getObjectId());
1578+ val = String.valueOf(activeChar.getTarget().getObjectId());
1579 }
1580 else if (val.toLowerCase().equals("$tallyid"))
1581 {
1582@@ -123,7 +123,7 @@
1583 }
1584 else if (val.toLowerCase().equals("$theading"))
1585 {
1586- val = String.valueOf(((Player) activeChar.getTarget()).getHeading());
1587+ val = String.valueOf(activeChar.getTarget().getHeading());
1588 }
1589
1590 sp.addPart(format.getBytes()[i], val);
1591Index: aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/ai/type/CreatureAI.java
1592IDEA additional info:
1593Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1594<+>ISO-8859-1
1595===================================================================
1596--- aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/ai/type/CreatureAI.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1597+++ aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/ai/type/CreatureAI.java (date 1579381341662)
1598@@ -491,14 +491,13 @@
1599 if (target.getFirstEffect(sk) != null)
1600 cancast = false;
1601 }
1602-
1603- if (cancast)
1604- return true;
1605+
1606+ return cancast;
1607 }
1608 else if (sk.getTargetType() == L2Skill.SkillTargetType.TARGET_AREA || sk.getTargetType() == L2Skill.SkillTargetType.TARGET_BEHIND_AREA || sk.getTargetType() == L2Skill.SkillTargetType.TARGET_FRONT_AREA)
1609 {
1610 boolean cancast = true;
1611- for (Creature target : ((Creature) getTarget()).getKnownTypeInRadius(Creature.class, sk.getSkillRadius()))
1612+ for (Creature target : getTarget().getKnownTypeInRadius(Creature.class, sk.getSkillRadius()))
1613 {
1614 if (!GeoEngine.getInstance().canSeeTarget(_actor, target))
1615 continue;
1616@@ -510,8 +509,7 @@
1617 if (effects.length > 0)
1618 cancast = true;
1619 }
1620- if (cancast)
1621- return true;
1622+ return cancast;
1623 }
1624 }
1625 else
1626@@ -531,13 +529,12 @@
1627 if (effects.length > 0)
1628 cancast = true;
1629 }
1630- if (cancast)
1631- return true;
1632+ return cancast;
1633 }
1634 else if (sk.getTargetType() == L2Skill.SkillTargetType.TARGET_AREA || sk.getTargetType() == L2Skill.SkillTargetType.TARGET_BEHIND_AREA || sk.getTargetType() == L2Skill.SkillTargetType.TARGET_FRONT_AREA)
1635 {
1636 boolean cancast = true;
1637- for (Creature target : ((Creature) getTarget()).getKnownTypeInRadius(Creature.class, sk.getSkillRadius()))
1638+ for (Creature target : getTarget().getKnownTypeInRadius(Creature.class, sk.getSkillRadius()))
1639 {
1640 if (!GeoEngine.getInstance().canSeeTarget(_actor, target))
1641 continue;
1642@@ -548,9 +545,8 @@
1643 if (target.getFirstEffect(sk) != null)
1644 cancast = false;
1645 }
1646-
1647- if (cancast)
1648- return true;
1649+
1650+ return cancast;
1651 }
1652 }
1653 return false;
1654@@ -578,10 +574,7 @@
1655 if (target.getFirstEffect(sk) != null)
1656 ccount++;
1657 }
1658-
1659- if (ccount < count)
1660- return true;
1661-
1662- return false;
1663- }
1664+
1665+ return ccount < count;
1666+ }
1667 }
1668\ No newline at end of file
1669Index: aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/ai/type/AttackableAI.java
1670IDEA additional info:
1671Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1672<+>ISO-8859-1
1673===================================================================
1674--- aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/ai/type/AttackableAI.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1675+++ aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/ai/type/AttackableAI.java (date 1579381341023)
1676@@ -1049,10 +1049,7 @@
1677 return false;
1678
1679 // Is a magic skill and character is magically muted or is a physical skill and character is physically muted.
1680- if ((skill.isMagic() && getActiveChar().isMuted()) || getActiveChar().isPhysicalMuted())
1681- return false;
1682-
1683- return true;
1684+ return (!skill.isMagic() || !getActiveChar().isMuted()) && !getActiveChar().isPhysicalMuted();
1685 }
1686
1687 /**
1688Index: aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/ai/type/PlayerAI.java
1689IDEA additional info:
1690Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1691<+>ISO-8859-1
1692===================================================================
1693--- aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/ai/type/PlayerAI.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1694+++ aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/ai/type/PlayerAI.java (date 1579381341350)
1695@@ -190,7 +190,7 @@
1696 // Initial check ; if the actor wasn't yet registered into AttackStanceTaskManager, broadcast AutoAttackStart packet. Check if a summon exists, if so, broadcast AutoAttackStart packet for the summon.
1697 if (!AttackStanceTaskManager.getInstance().isInAttackStance(_actor))
1698 {
1699- final Summon summon = ((Player) _actor).getSummon();
1700+ final Summon summon = _actor.getSummon();
1701 if (summon != null)
1702 summon.broadcastPacket(new AutoAttackStart(summon.getObjectId()));
1703
1704Index: aCis_gameserver/java/net/sf/l2j/gameserver/skills/Formulas.java
1705IDEA additional info:
1706Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1707<+>ISO-8859-1
1708===================================================================
1709--- aCis_gameserver/java/net/sf/l2j/gameserver/skills/Formulas.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1710+++ aCis_gameserver/java/net/sf/l2j/gameserver/skills/Formulas.java (date 1579381341215)
1711@@ -734,7 +734,7 @@
1712 Player player = (Player) target;
1713 if (!player.isInvul())
1714 {
1715- if (!(attacker instanceof Player && (((Player) attacker).isGM() && !((Player) attacker).getAccessLevel().canGiveDamage())))
1716+ if (!(attacker instanceof Player && (attacker.isGM() && !((Player) attacker).getAccessLevel().canGiveDamage())))
1717 {
1718 player.setCurrentHp(1);
1719 player.setCurrentCp(1);
1720@@ -754,7 +754,7 @@
1721 Player player = (Player) target;
1722 if (!player.isInvul())
1723 {
1724- if (!(attacker instanceof Player && (((Player) attacker).isGM() && !((Player) attacker).getAccessLevel().canGiveDamage())))
1725+ if (!(attacker instanceof Player && (attacker.isGM() && !((Player) attacker).getAccessLevel().canGiveDamage())))
1726 {
1727 player.setCurrentCp(1);
1728 player.sendPacket(SystemMessageId.LETHAL_STRIKE);
1729@@ -785,7 +785,7 @@
1730 return;
1731
1732 // Break automatically the skill cast if under attack.
1733- if (target instanceof Player && ((Player) target).getFusionSkill() != null)
1734+ if (target instanceof Player && target.getFusionSkill() != null)
1735 {
1736 target.breakCast();
1737 return;
1738Index: aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/Creature.java
1739IDEA additional info:
1740Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1741<+>ISO-8859-1
1742===================================================================
1743--- aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/Creature.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1744+++ aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/Creature.java (date 1579381341757)
1745@@ -890,7 +890,7 @@
1746
1747 if (this instanceof Player)
1748 {
1749- if (obj instanceof Pet && ((Pet) obj).getOwner() == ((Player) this))
1750+ if (obj instanceof Pet && ((Pet) obj).getOwner() == this)
1751 continue;
1752 }
1753 else if (this instanceof Attackable)
1754@@ -1543,7 +1543,7 @@
1755 {
1756 CreatureAI oldAI = getAI();
1757 if (oldAI != null && oldAI != newAI && oldAI instanceof AttackableAI)
1758- ((AttackableAI) oldAI).stopAITask();
1759+ oldAI.stopAITask();
1760
1761 _ai = newAI;
1762 }
1763@@ -1780,7 +1780,7 @@
1764 if (this instanceof Player)
1765 ((Player) this).broadcastUserInfo();
1766 else if (this instanceof Summon)
1767- ((Summon) this).broadcastStatusUpdate();
1768+ this.broadcastStatusUpdate();
1769 else if (this instanceof Npc)
1770 {
1771 for (Player player : getKnownType(Player.class))
1772@@ -3264,10 +3264,7 @@
1773 return false;
1774
1775 // Can't interact if regular distance doesn't match.
1776- if (!isInsideRadius(player, Npc.INTERACTION_DISTANCE, true, false))
1777- return false;
1778-
1779- return true;
1780+ return isInsideRadius(player, Npc.INTERACTION_DISTANCE, true, false);
1781 }
1782
1783 /**
1784Index: aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q334_TheWishingPotion.java
1785IDEA additional info:
1786Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1787<+>ISO-8859-1
1788===================================================================
1789--- aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q334_TheWishingPotion.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1790+++ aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q334_TheWishingPotion.java (date 1579381242445)
1791@@ -930,12 +930,9 @@
1792
1793 if (current != TYRANTS_CHITIN && !st.hasQuestItems(TYRANTS_CHITIN))
1794 return false;
1795-
1796- if (current != BUGBEAR_BLOOD && !st.hasQuestItems(BUGBEAR_BLOOD))
1797- return false;
1798-
1799- return true;
1800- }
1801+
1802+ return current == BUGBEAR_BLOOD || st.hasQuestItems(BUGBEAR_BLOOD);
1803+ }
1804
1805 private String exchangeWishPotion(QuestState st, String event, Npc npc, Player player, String wish)
1806 {
1807Index: aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q358_IllegitimateChildOfAGoddess.java
1808IDEA additional info:
1809Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1810<+>ISO-8859-1
1811===================================================================
1812--- aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q358_IllegitimateChildOfAGoddess.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1813+++ aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q358_IllegitimateChildOfAGoddess.java (date 1579381242393)
1814@@ -16,7 +16,7 @@
1815 private static final int SCALE = 5868;
1816
1817 // Reward
1818- private static final int REWARDS[] =
1819+ private static final int[] REWARDS =
1820 {
1821 6329,
1822 6331,
1823Index: aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q367_ElectrifyingRecharge.java
1824IDEA additional info:
1825Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1826<+>ISO-8859-1
1827===================================================================
1828--- aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q367_ElectrifyingRecharge.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1829+++ aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q367_ElectrifyingRecharge.java (date 1579381242324)
1830@@ -24,7 +24,7 @@
1831 private static final int TITAN_LAMP_5 = 5880;
1832
1833 // Reward
1834- private static final int REWARDS[] =
1835+ private static final int[] REWARDS =
1836 {
1837 4553,
1838 4554,
1839Index: aCis_gameserver/java/net/sf/l2j/gameserver/handler/skillhandlers/Pdam.java
1840IDEA additional info:
1841Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1842<+>ISO-8859-1
1843===================================================================
1844--- aCis_gameserver/java/net/sf/l2j/gameserver/handler/skillhandlers/Pdam.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1845+++ aCis_gameserver/java/net/sf/l2j/gameserver/handler/skillhandlers/Pdam.java (date 1579381341605)
1846@@ -50,10 +50,10 @@
1847 if (weapon != null && weapon.getItemType() != WeaponType.BOW && Formulas.calcPhysicalSkillEvasion(target, skill))
1848 {
1849 if (activeChar instanceof Player)
1850- ((Player) activeChar).sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_DODGES_ATTACK).addCharName(target));
1851+ activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_DODGES_ATTACK).addCharName(target));
1852
1853 if (target instanceof Player)
1854- ((Player) target).sendPacket(SystemMessage.getSystemMessage(SystemMessageId.AVOIDED_S1_ATTACK).addCharName(activeChar));
1855+ target.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.AVOIDED_S1_ATTACK).addCharName(activeChar));
1856
1857 // no futher calculations needed.
1858 continue;
1859Index: aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/instance/Pet.java
1860IDEA additional info:
1861Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1862<+>ISO-8859-1
1863===================================================================
1864--- aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/instance/Pet.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1865+++ aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/instance/Pet.java (date 1579381341312)
1866@@ -705,11 +705,8 @@
1867
1868 if (npcId > 12525 && npcId < 12529 && item.getBodyPart() == Item.SLOT_STRIDER)
1869 return true;
1870-
1871- if (npcId > 12779 && npcId < 12783 && item.getBodyPart() == Item.SLOT_BABYPET)
1872- return true;
1873-
1874- return false;
1875+
1876+ return npcId > 12779 && npcId < 12783 && item.getBodyPart() == Item.SLOT_BABYPET;
1877 }
1878
1879 /**
1880Index: aCis_gameserver/java/net/sf/l2j/commons/crypt/BCrypt.java
1881IDEA additional info:
1882Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
1883<+>ISO-8859-1
1884===================================================================
1885--- aCis_gameserver/java/net/sf/l2j/commons/crypt/BCrypt.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
1886+++ aCis_gameserver/java/net/sf/l2j/commons/crypt/BCrypt.java (date 1579381341205)
1887@@ -1,6 +1,7 @@
1888 package net.sf.l2j.commons.crypt;
1889
1890 import java.io.UnsupportedEncodingException;
1891+import java.nio.charset.StandardCharsets;
1892 import java.security.SecureRandom;
1893
1894 /**
1895@@ -44,7 +45,7 @@
1896 private static final int BLOWFISH_NUM_ROUNDS = 16;
1897
1898 // Initial contents of key schedule
1899- private static final int P_orig[] =
1900+ private static final int[] P_orig =
1901 {
1902 0x243f6a88,
1903 0x85a308d3,
1904@@ -65,7 +66,7 @@
1905 0x9216d5d9,
1906 0x8979fb1b
1907 };
1908- private static final int S_orig[] =
1909+ private static final int[] S_orig =
1910 {
1911 0xd1310ba6,
1912 0x98dfb5ac,
1913@@ -1096,7 +1097,7 @@
1914 // bcrypt IV: "OrpheanBeholderScryDoubt". The C implementation calls
1915 // this "ciphertext", but it is really plaintext or an IV. We keep
1916 // the name to make code comparison easier.
1917- static private final int bf_crypt_ciphertext[] =
1918+ static private final int[] bf_crypt_ciphertext =
1919 {
1920 0x4f727068,
1921 0x65616e42,
1922@@ -1107,7 +1108,7 @@
1923 };
1924
1925 // Table for Base64 encoding
1926- static private final char base64_code[] =
1927+ static private final char[] base64_code =
1928 {
1929 '.',
1930 '/',
1931@@ -1176,7 +1177,7 @@
1932 };
1933
1934 // Table for Base64 decoding
1935- static private final byte index_64[] =
1936+ static private final byte[] index_64 =
1937 {
1938 -1,
1939 -1,
1940@@ -1309,8 +1310,8 @@
1941 };
1942
1943 // Expanded Blowfish key
1944- private int P[];
1945- private int S[];
1946+ private int[] P;
1947+ private int[] S;
1948
1949 /**
1950 * Encode a byte array using bcrypt's slightly-modified base64 encoding scheme. Note that this is *not* compatible with the standard MIME-base64 encoding.
1951@@ -1319,7 +1320,7 @@
1952 * @return base64-encoded string
1953 * @exception IllegalArgumentException if the length is invalid
1954 */
1955- private static String encode_base64(byte d[], int len) throws IllegalArgumentException
1956+ private static String encode_base64(byte[] d, int len) throws IllegalArgumentException
1957 {
1958 int off = 0;
1959 StringBuffer rs = new StringBuffer();
1960@@ -1378,7 +1379,7 @@
1961 {
1962 StringBuffer rs = new StringBuffer();
1963 int off = 0, slen = s.length(), olen = 0;
1964- byte ret[];
1965+ byte[] ret;
1966 byte c1, c2, c3, c4, o;
1967
1968 if (maxolen <= 0)
1969@@ -1421,7 +1422,7 @@
1970 * @param lr an array containing the two 32-bit half blocks
1971 * @param off the position in the array of the blocks
1972 */
1973- private final void encipher(int lr[], int off)
1974+ private final void encipher(int[] lr, int off)
1975 {
1976 int i, n, l = lr[off], r = lr[off + 1];
1977
1978@@ -1452,7 +1453,7 @@
1979 * @param offp a "pointer" (as a one-entry array) to the current offset into data
1980 * @return the next word of material from data
1981 */
1982- private static int streamtoword(byte data[], int offp[])
1983+ private static int streamtoword(byte[] data, int[] offp)
1984 {
1985 int i;
1986 int word = 0;
1987@@ -1481,14 +1482,14 @@
1988 * Key the Blowfish cipher
1989 * @param key an array containing the key
1990 */
1991- private void key(byte key[])
1992+ private void key(byte[] key)
1993 {
1994 int i;
1995- int koffp[] =
1996+ int[] koffp =
1997 {
1998 0
1999 };
2000- int lr[] =
2001+ int[] lr =
2002 {
2003 0,
2004 0
2005@@ -1518,17 +1519,18 @@
2006 * @param data salt information
2007 * @param key password information
2008 */
2009- private void ekskey(byte data[], byte key[])
2010+ private void ekskey(byte[] data, byte[] key)
2011 {
2012 int i;
2013- int koffp[] =
2014+ int[] koffp =
2015 {
2016 0
2017- }, doffp[] =
2018- {
2019- 0
2020- };
2021- int lr[] =
2022+ };
2023+ int[] doffp =
2024+ {
2025+ 0
2026+ };
2027+ int[] lr =
2028 {
2029 0,
2030 0
2031@@ -1565,11 +1567,11 @@
2032 * @param cdata the plaintext to encrypt
2033 * @return an array containing the binary hashed password
2034 */
2035- public byte[] crypt_raw(byte password[], byte salt[], int log_rounds, int cdata[])
2036+ public byte[] crypt_raw(byte[] password, byte[] salt, int log_rounds, int[] cdata)
2037 {
2038 int rounds, i, j;
2039 int clen = cdata.length;
2040- byte ret[];
2041+ byte[] ret;
2042
2043 if (log_rounds < 4 || log_rounds > 30)
2044 throw new IllegalArgumentException("Bad number of rounds");
2045@@ -1612,7 +1614,9 @@
2046 {
2047 BCrypt B;
2048 String real_salt;
2049- byte passwordb[], saltb[], hashed[];
2050+ byte[] passwordb;
2051+ byte[] saltb;
2052+ byte[] hashed;
2053 char minor = (char) 0;
2054 int rounds, off = 0;
2055 StringBuffer rs = new StringBuffer();
2056@@ -1635,15 +1639,8 @@
2057 rounds = Integer.parseInt(salt.substring(off, off + 2));
2058
2059 real_salt = salt.substring(off + 3, off + 25);
2060- try
2061- {
2062- passwordb = (password + (minor >= 'a' ? "\000" : "")).getBytes("UTF-8");
2063- }
2064- catch (UnsupportedEncodingException uee)
2065- {
2066- throw new AssertionError("UTF-8 is not supported");
2067- }
2068-
2069+ passwordb = (password + (minor >= 'a' ? "\000" : "")).getBytes(StandardCharsets.UTF_8);
2070+
2071 saltb = decode_base64(real_salt, BCRYPT_SALT_LEN);
2072
2073 B = new BCrypt();
2074@@ -1659,7 +1656,7 @@
2075 {
2076 throw new IllegalArgumentException("rounds exceeds maximum (30)");
2077 }
2078- rs.append(Integer.toString(rounds));
2079+ rs.append(rounds);
2080 rs.append("$");
2081 rs.append(encode_base64(saltb, saltb.length));
2082 rs.append(encode_base64(hashed, bf_crypt_ciphertext.length * 4 - 1));
2083@@ -1675,7 +1672,7 @@
2084 public static String gensalt(int log_rounds, SecureRandom random)
2085 {
2086 StringBuffer rs = new StringBuffer();
2087- byte rnd[] = new byte[BCRYPT_SALT_LEN];
2088+ byte[] rnd = new byte[BCRYPT_SALT_LEN];
2089
2090 random.nextBytes(rnd);
2091
2092@@ -1686,7 +1683,7 @@
2093 {
2094 throw new IllegalArgumentException("log_rounds exceeds maximum (30)");
2095 }
2096- rs.append(Integer.toString(log_rounds));
2097+ rs.append(log_rounds);
2098 rs.append("$");
2099 rs.append(encode_base64(rnd, rnd.length));
2100 return rs.toString();
2101@@ -1719,18 +1716,11 @@
2102 */
2103 public static boolean checkpw(String plaintext, String hashed)
2104 {
2105- byte hashed_bytes[];
2106- byte try_bytes[];
2107- try
2108- {
2109- String try_pw = hashpw(plaintext, hashed);
2110- hashed_bytes = hashed.getBytes("UTF-8");
2111- try_bytes = try_pw.getBytes("UTF-8");
2112- }
2113- catch (UnsupportedEncodingException uee)
2114- {
2115- return false;
2116- }
2117+ byte[] hashed_bytes;
2118+ byte[] try_bytes;
2119+ String try_pw = hashpw(plaintext, hashed);
2120+ hashed_bytes = hashed.getBytes(StandardCharsets.UTF_8);
2121+ try_bytes = try_pw.getBytes(StandardCharsets.UTF_8);
2122 if (hashed_bytes.length != try_bytes.length)
2123 return false;
2124 byte ret = 0;
2125Index: aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/instance/DerbyTrackManagerNpc.java
2126IDEA additional info:
2127Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2128<+>ISO-8859-1
2129===================================================================
2130--- aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/instance/DerbyTrackManagerNpc.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2131+++ aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/instance/DerbyTrackManagerNpc.java (date 1579381341230)
2132@@ -21,7 +21,7 @@
2133
2134 public class DerbyTrackManagerNpc extends Folk
2135 {
2136- protected static final int TICKET_PRICES[] =
2137+ protected static final int[] TICKET_PRICES =
2138 {
2139 100,
2140 500,
2141Index: aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q508_AClansReputation.java
2142IDEA additional info:
2143Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2144<+>ISO-8859-1
2145===================================================================
2146--- aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q508_AClansReputation.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2147+++ aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q508_AClansReputation.java (date 1579381242358)
2148@@ -37,7 +37,7 @@
2149 private static final int RAHHA = 25051;
2150
2151 // Reward list (itemId, minClanPoints, maxClanPoints)
2152- private static final int reward_list[][] =
2153+ private static final int[][] reward_list =
2154 {
2155 {
2156 PALIBATI_QUEEN_THEMIS,
2157@@ -78,7 +78,7 @@
2158 };
2159
2160 // Radar
2161- private static final int radar[][] =
2162+ private static final int[][] radar =
2163 {
2164 {
2165 192346,
2166Index: aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q384_WarehouseKeepersPastime.java
2167IDEA additional info:
2168Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2169<+>ISO-8859-1
2170===================================================================
2171--- aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q384_WarehouseKeepersPastime.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2172+++ aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q384_WarehouseKeepersPastime.java (date 1579381242167)
2173@@ -165,13 +165,13 @@
2174
2175 // Verify if the given number is already on the player array, if yes, it's invalid, otherwise register it.
2176 if (playerArray.contains(number))
2177- htmltext = fillBoard(st, getHtmlText(npcId + "-" + String.valueOf(14 + 2 * playerArray.length()) + ".htm"));
2178+ htmltext = fillBoard(st, getHtmlText(npcId + "-" + (14 + 2 * playerArray.length()) + ".htm"));
2179 else
2180 {
2181 // Stores the final String.
2182 st.set("playerArray", playerArray.concat(number));
2183
2184- htmltext = fillBoard(st, getHtmlText(npcId + "-" + String.valueOf(13 + 2 * playerArray.length()) + ".htm"));
2185+ htmltext = fillBoard(st, getHtmlText(npcId + "-" + (13 + 2 * playerArray.length()) + ".htm"));
2186 }
2187 }
2188 else if (event.startsWith("select_3-")) // pick #6
2189Index: aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/instance/Monster.java
2190IDEA additional info:
2191Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2192<+>ISO-8859-1
2193===================================================================
2194--- aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/instance/Monster.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2195+++ aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/instance/Monster.java (date 1579381340949)
2196@@ -281,10 +281,7 @@
2197 public boolean isAutoAttackable(Creature attacker)
2198 {
2199 // FIXME: to test to allow monsters hit others monsters
2200- if (attacker instanceof Monster)
2201- return false;
2202-
2203- return true;
2204+ return !(attacker instanceof Monster);
2205 }
2206
2207 @Override
2208Index: aCis_gameserver/java/net/sf/l2j/gameserver/skills/l2skills/L2SkillElemental.java
2209IDEA additional info:
2210Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2211<+>ISO-8859-1
2212===================================================================
2213--- aCis_gameserver/java/net/sf/l2j/gameserver/skills/l2skills/L2SkillElemental.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2214+++ aCis_gameserver/java/net/sf/l2j/gameserver/skills/l2skills/L2SkillElemental.java (date 1579381341464)
2215@@ -22,11 +22,8 @@
2216 _seeds[0] = set.getInteger("seed1", 0);
2217 _seeds[1] = set.getInteger("seed2", 0);
2218 _seeds[2] = set.getInteger("seed3", 0);
2219-
2220- if (set.getInteger("seed_any", 0) == 1)
2221- _seedAny = true;
2222- else
2223- _seedAny = false;
2224+
2225+ _seedAny = set.getInteger("seed_any", 0) == 1;
2226 }
2227
2228 @Override
2229Index: aCis_gameserver/java/net/sf/l2j/gameserver/skills/l2skills/L2SkillChargeDmg.java
2230IDEA additional info:
2231Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2232<+>ISO-8859-1
2233===================================================================
2234--- aCis_gameserver/java/net/sf/l2j/gameserver/skills/l2skills/L2SkillChargeDmg.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2235+++ aCis_gameserver/java/net/sf/l2j/gameserver/skills/l2skills/L2SkillChargeDmg.java (date 1579381340556)
2236@@ -46,10 +46,10 @@
2237 if (skillIsEvaded)
2238 {
2239 if (caster instanceof Player)
2240- ((Player) caster).sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_DODGES_ATTACK).addCharName(target));
2241+ caster.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_DODGES_ATTACK).addCharName(target));
2242
2243 if (target instanceof Player)
2244- ((Player) target).sendPacket(SystemMessage.getSystemMessage(SystemMessageId.AVOIDED_S1_ATTACK).addCharName(caster));
2245+ target.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.AVOIDED_S1_ATTACK).addCharName(caster));
2246
2247 // no futher calculations needed.
2248 continue;
2249Index: aCis_gameserver/java/net/sf/l2j/gameserver/handler/skillhandlers/Blow.java
2250IDEA additional info:
2251Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2252<+>ISO-8859-1
2253===================================================================
2254--- aCis_gameserver/java/net/sf/l2j/gameserver/handler/skillhandlers/Blow.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2255+++ aCis_gameserver/java/net/sf/l2j/gameserver/handler/skillhandlers/Blow.java (date 1579381341803)
2256@@ -62,10 +62,10 @@
2257 if (skillIsEvaded)
2258 {
2259 if (activeChar instanceof Player)
2260- ((Player) activeChar).sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_DODGES_ATTACK).addCharName(target));
2261+ activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_DODGES_ATTACK).addCharName(target));
2262
2263 if (target instanceof Player)
2264- ((Player) target).sendPacket(SystemMessage.getSystemMessage(SystemMessageId.AVOIDED_S1_ATTACK).addCharName(activeChar));
2265+ target.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.AVOIDED_S1_ATTACK).addCharName(activeChar));
2266
2267 // no futher calculations needed.
2268 continue;
2269@@ -136,7 +136,7 @@
2270 Formulas.calcCastBreak(target, damage);
2271
2272 if (activeChar instanceof Player)
2273- ((Player) activeChar).sendDamageMessage(target, (int) damage, false, true, false);
2274+ activeChar.sendDamageMessage(target, (int) damage, false, true, false);
2275 }
2276 else
2277 activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ATTACK_FAILED));
2278Index: aCis_gameserver/java/net/sf/l2j/commons/data/xml/IXmlReader.java
2279IDEA additional info:
2280Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2281<+>ISO-8859-1
2282===================================================================
2283--- aCis_gameserver/java/net/sf/l2j/commons/data/xml/IXmlReader.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2284+++ aCis_gameserver/java/net/sf/l2j/commons/data/xml/IXmlReader.java (date 1579381341457)
2285@@ -412,12 +412,12 @@
2286 }
2287 }
2288
2289- public static boolean isNode(Node node)
2290+ static boolean isNode(Node node)
2291 {
2292 return node.getNodeType() == Node.ELEMENT_NODE;
2293 }
2294
2295- public static boolean isText(Node node)
2296+ static boolean isText(Node node)
2297 {
2298 return node.getNodeType() == Node.TEXT_NODE;
2299 }
2300Index: aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/instance/VillageMaster.java
2301IDEA additional info:
2302Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2303<+>ISO-8859-1
2304===================================================================
2305--- aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/instance/VillageMaster.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2306+++ aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/instance/VillageMaster.java (date 1579381341742)
2307@@ -606,11 +606,8 @@
2308 return false;
2309
2310 qs = player.getQuestState("Q235_MimirsElixir");
2311- if (qs == null || !qs.isCompleted())
2312- return false;
2313-
2314- return true;
2315- }
2316+ return qs != null && qs.isCompleted();
2317+ }
2318
2319 private final Set<ClassId> getAvailableSubClasses(Player player)
2320 {
2321Index: aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/instance/FestivalMonster.java
2322IDEA additional info:
2323Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2324<+>ISO-8859-1
2325===================================================================
2326--- aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/instance/FestivalMonster.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2327+++ aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/instance/FestivalMonster.java (date 1579381341679)
2328@@ -29,11 +29,8 @@
2329 @Override
2330 public boolean isAutoAttackable(Creature attacker)
2331 {
2332- if (attacker instanceof FestivalMonster)
2333- return false;
2334-
2335- return true;
2336- }
2337+ return !(attacker instanceof FestivalMonster);
2338+ }
2339
2340 /**
2341 * All mobs in the festival are aggressive, and have high aggro range.
2342Index: aCis_gameserver/java/net/sf/l2j/commons/logging/filter/ItemFilter.java
2343IDEA additional info:
2344Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2345<+>ISO-8859-1
2346===================================================================
2347--- aCis_gameserver/java/net/sf/l2j/commons/logging/filter/ItemFilter.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2348+++ aCis_gameserver/java/net/sf/l2j/commons/logging/filter/ItemFilter.java (date 1579381340806)
2349@@ -29,9 +29,6 @@
2350 return true;
2351
2352 final ItemInstance item = ((ItemInstance) record.getParameters()[1]);
2353- if (!ArraysUtil.contains(EXCLUDE_TYPE, item.getItemType()))
2354- return true;
2355-
2356- return false;
2357- }
2358+ return !ArraysUtil.contains(EXCLUDE_TYPE, item.getItemType());
2359+ }
2360 }
2361\ No newline at end of file
2362Index: aCis_gameserver/java/net/sf/l2j/commons/mmocore/IAcceptFilter.java
2363IDEA additional info:
2364Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2365<+>ISO-8859-1
2366===================================================================
2367--- aCis_gameserver/java/net/sf/l2j/commons/mmocore/IAcceptFilter.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2368+++ aCis_gameserver/java/net/sf/l2j/commons/mmocore/IAcceptFilter.java (date 1579381341165)
2369@@ -4,5 +4,5 @@
2370
2371 public interface IAcceptFilter
2372 {
2373- public boolean accept(SocketChannel sc);
2374+ boolean accept(SocketChannel sc);
2375 }
2376\ No newline at end of file
2377Index: aCis_gameserver/java/net/sf/l2j/gameserver/skills/conditions/ConditionPlayerActiveEffectId.java
2378IDEA additional info:
2379Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2380<+>ISO-8859-1
2381===================================================================
2382--- aCis_gameserver/java/net/sf/l2j/gameserver/skills/conditions/ConditionPlayerActiveEffectId.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2383+++ aCis_gameserver/java/net/sf/l2j/gameserver/skills/conditions/ConditionPlayerActiveEffectId.java (date 1579381340987)
2384@@ -26,9 +26,6 @@
2385 public boolean testImpl(Creature effector, Creature effected, L2Skill skill, Item item)
2386 {
2387 final L2Effect e = effector.getFirstEffect(_effectId);
2388- if (e != null && (_effectLvl == -1 || _effectLvl <= e.getSkill().getLevel()))
2389- return true;
2390-
2391- return false;
2392- }
2393+ return e != null && (_effectLvl == -1 || _effectLvl <= e.getSkill().getLevel());
2394+ }
2395 }
2396\ No newline at end of file
2397Index: aCis_gameserver/java/net/sf/l2j/commons/mmocore/IPacketHandler.java
2398IDEA additional info:
2399Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2400<+>ISO-8859-1
2401===================================================================
2402--- aCis_gameserver/java/net/sf/l2j/commons/mmocore/IPacketHandler.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2403+++ aCis_gameserver/java/net/sf/l2j/commons/mmocore/IPacketHandler.java (date 1579381341377)
2404@@ -4,5 +4,5 @@
2405
2406 public interface IPacketHandler<T extends MMOClient<?>>
2407 {
2408- public ReceivablePacket<T> handlePacket(ByteBuffer buf, T client);
2409+ ReceivablePacket<T> handlePacket(ByteBuffer buf, T client);
2410 }
2411\ No newline at end of file
2412Index: aCis_gameserver/java/net/sf/l2j/gameserver/skills/conditions/ConditionForceBuff.java
2413IDEA additional info:
2414Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2415<+>ISO-8859-1
2416===================================================================
2417--- aCis_gameserver/java/net/sf/l2j/gameserver/skills/conditions/ConditionForceBuff.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2418+++ aCis_gameserver/java/net/sf/l2j/gameserver/skills/conditions/ConditionForceBuff.java (date 1579381341523)
2419@@ -31,8 +31,7 @@
2420 if (_forces[1] > 0)
2421 {
2422 L2Effect force = effector.getFirstEffect(SPELL_FORCE);
2423- if (force == null || ((EffectFusion) force)._effect < _forces[1])
2424- return false;
2425+ return force != null && ((EffectFusion) force)._effect >= _forces[1];
2426 }
2427 return true;
2428 }
2429Index: aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/instance/ClassMaster.java
2430IDEA additional info:
2431Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2432<+>ISO-8859-1
2433===================================================================
2434--- aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/instance/ClassMaster.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2435+++ aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/instance/ClassMaster.java (date 1579381341190)
2436@@ -301,12 +301,9 @@
2437
2438 if (oldCID == newCID.getParent())
2439 return true;
2440-
2441- if (Config.ALLOW_ENTIRE_TREE && newCID.childOf(oldCID))
2442- return true;
2443-
2444- return false;
2445- }
2446+
2447+ return Config.ALLOW_ENTIRE_TREE && newCID.childOf(oldCID);
2448+ }
2449
2450 private static String getRequiredItems(int level)
2451 {
2452Index: aCis_gameserver/java/net/sf/l2j/gameserver/skills/conditions/ConditionListener.java
2453IDEA additional info:
2454Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2455<+>ISO-8859-1
2456===================================================================
2457--- aCis_gameserver/java/net/sf/l2j/gameserver/skills/conditions/ConditionListener.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2458+++ aCis_gameserver/java/net/sf/l2j/gameserver/skills/conditions/ConditionListener.java (date 1579381340926)
2459@@ -5,5 +5,5 @@
2460 */
2461 public interface ConditionListener
2462 {
2463- public void notifyChanged();
2464+ void notifyChanged();
2465 }
2466\ No newline at end of file
2467Index: aCis_gameserver/java/net/sf/l2j/commons/mmocore/IMMOExecutor.java
2468IDEA additional info:
2469Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2470<+>ISO-8859-1
2471===================================================================
2472--- aCis_gameserver/java/net/sf/l2j/commons/mmocore/IMMOExecutor.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2473+++ aCis_gameserver/java/net/sf/l2j/commons/mmocore/IMMOExecutor.java (date 1579381341438)
2474@@ -2,5 +2,5 @@
2475
2476 public interface IMMOExecutor<T extends MMOClient<?>>
2477 {
2478- public void execute(ReceivablePacket<T> packet);
2479+ void execute(ReceivablePacket<T> packet);
2480 }
2481\ No newline at end of file
2482Index: aCis_gameserver/java/net/sf/l2j/commons/mmocore/IClientFactory.java
2483IDEA additional info:
2484Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2485<+>ISO-8859-1
2486===================================================================
2487--- aCis_gameserver/java/net/sf/l2j/commons/mmocore/IClientFactory.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2488+++ aCis_gameserver/java/net/sf/l2j/commons/mmocore/IClientFactory.java (date 1579381341325)
2489@@ -2,5 +2,5 @@
2490
2491 public interface IClientFactory<T extends MMOClient<?>>
2492 {
2493- public T create(final MMOConnection<T> con);
2494+ T create(final MMOConnection<T> con);
2495 }
2496\ No newline at end of file
2497Index: aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/instance/Chest.java
2498IDEA additional info:
2499Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2500<+>ISO-8859-1
2501===================================================================
2502--- aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/instance/Chest.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2503+++ aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/instance/Chest.java (date 1579381341150)
2504@@ -82,12 +82,9 @@
2505 {
2506 if (super.isMovementDisabled())
2507 return true;
2508-
2509- if (isInteracted())
2510- return false;
2511-
2512- return true;
2513- }
2514+
2515+ return !isInteracted();
2516+ }
2517
2518 @Override
2519 public boolean hasRandomAnimation()
2520Index: aCis_gameserver/java/net/sf/l2j/commons/network/AttributeType.java
2521IDEA additional info:
2522Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2523<+>ISO-8859-1
2524===================================================================
2525--- aCis_gameserver/java/net/sf/l2j/commons/network/AttributeType.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2526+++ aCis_gameserver/java/net/sf/l2j/commons/network/AttributeType.java (date 1579381341137)
2527@@ -13,7 +13,7 @@
2528
2529 private final int _id;
2530
2531- private AttributeType(int id)
2532+ AttributeType(int id)
2533 {
2534 _id = id;
2535 }
2536Index: aCis_gameserver/java/net/sf/l2j/commons/network/StatusType.java
2537IDEA additional info:
2538Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2539<+>ISO-8859-1
2540===================================================================
2541--- aCis_gameserver/java/net/sf/l2j/commons/network/StatusType.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2542+++ aCis_gameserver/java/net/sf/l2j/commons/network/StatusType.java (date 1579381341631)
2543@@ -12,7 +12,7 @@
2544 private final int _id;
2545 private final String _name;
2546
2547- private StatusType(int id, String name)
2548+ StatusType(int id, String name)
2549 {
2550 _id = id;
2551 _name = name;
2552Index: aCis_gameserver/java/net/sf/l2j/commons/geometry/Cube.java
2553IDEA additional info:
2554Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2555<+>ISO-8859-1
2556===================================================================
2557--- aCis_gameserver/java/net/sf/l2j/commons/geometry/Cube.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2558+++ aCis_gameserver/java/net/sf/l2j/commons/geometry/Cube.java (date 1579381341279)
2559@@ -50,11 +50,8 @@
2560 return false;
2561
2562 d = y - _y;
2563- if (d < 0 || d > _a)
2564- return false;
2565-
2566- return true;
2567- }
2568+ return d >= 0 && d <= _a;
2569+ }
2570
2571 @Override
2572 public Location getRandomLocation()
2573Index: aCis_gameserver/java/net/sf/l2j/commons/geometry/Rectangle.java
2574IDEA additional info:
2575Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2576<+>ISO-8859-1
2577===================================================================
2578--- aCis_gameserver/java/net/sf/l2j/commons/geometry/Rectangle.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2579+++ aCis_gameserver/java/net/sf/l2j/commons/geometry/Rectangle.java (date 1579381340770)
2580@@ -59,11 +59,8 @@
2581 return false;
2582
2583 d = y - _y;
2584- if (d < 0 || d > _h)
2585- return false;
2586-
2587- return true;
2588- }
2589+ return d >= 0 && d <= _h;
2590+ }
2591
2592 @Override
2593 public boolean isInside(int x, int y, int z)
2594@@ -73,11 +70,8 @@
2595 return false;
2596
2597 d = y - _y;
2598- if (d < 0 || d > _h)
2599- return false;
2600-
2601- return true;
2602- }
2603+ return d >= 0 && d <= _h;
2604+ }
2605
2606 @Override
2607 public Location getRandomLocation()
2608Index: aCis_gameserver/java/net/sf/l2j/commons/geometry/Cuboid.java
2609IDEA additional info:
2610Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2611<+>ISO-8859-1
2612===================================================================
2613--- aCis_gameserver/java/net/sf/l2j/commons/geometry/Cuboid.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2614+++ aCis_gameserver/java/net/sf/l2j/commons/geometry/Cuboid.java (date 1579381341108)
2615@@ -53,11 +53,8 @@
2616 return false;
2617
2618 d = y - _y;
2619- if (d < 0 || d > _h)
2620- return false;
2621-
2622- return true;
2623- }
2624+ return d >= 0 && d <= _h;
2625+ }
2626
2627 @Override
2628 public Location getRandomLocation()
2629Index: aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/instance/SchemeBuffer.java
2630IDEA additional info:
2631Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2632<+>ISO-8859-1
2633===================================================================
2634--- aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/instance/SchemeBuffer.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2635+++ aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/instance/SchemeBuffer.java (date 1579381340839)
2636@@ -161,7 +161,7 @@
2637 final String schemeName = st.nextToken();
2638 final Map<String, ArrayList<Integer>> schemes = BufferManager.getInstance().getPlayerSchemes(player.getObjectId());
2639
2640- if (schemes != null && schemes.containsKey(schemeName))
2641+ if (schemes != null)
2642 schemes.remove(schemeName);
2643 }
2644 catch (Exception e)
2645Index: aCis_gameserver/java/net/sf/l2j/commons/geometry/Polygon.java
2646IDEA additional info:
2647Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2648<+>ISO-8859-1
2649===================================================================
2650--- aCis_gameserver/java/net/sf/l2j/commons/geometry/Polygon.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2651+++ aCis_gameserver/java/net/sf/l2j/commons/geometry/Polygon.java (date 1579381340960)
2652@@ -138,10 +138,10 @@
2653 // get point
2654 final int size = points.size();
2655 int index = 0;
2656- int point[] = points.get(0);
2657+ int[] point = points.get(0);
2658 for (int i = 1; i < size; i++)
2659 {
2660- int pt[] = points.get(i);
2661+ int[] pt = points.get(i);
2662
2663 // x lower, or x same and y higher
2664 if ((pt[0] < point[0]) || pt[0] == point[0] && pt[1] > point[1])
2665@@ -152,10 +152,10 @@
2666 }
2667
2668 // get previous point
2669- final int pointPrev[] = points.get(getPrevIndex(size, index));
2670+ final int[] pointPrev = points.get(getPrevIndex(size, index));
2671
2672 // get next point
2673- final int pointNext[] = points.get(getNextIndex(size, index));
2674+ final int[] pointNext = points.get(getNextIndex(size, index));
2675
2676 // get orientation
2677 final int vx = point[0] - pointPrev[0];
2678@@ -212,9 +212,9 @@
2679 for (int i = 0; i < size - 1; i++)
2680 {
2681 // get 3 points
2682- final int point[] = points.get(i);
2683- final int pointNext[] = points.get(i + 1);
2684- final int pointNextNext[] = points.get(getNextIndex(size, i + 2));
2685+ final int[] point = points.get(i);
2686+ final int[] pointNext = points.get(i + 1);
2687+ final int[] pointNextNext = points.get(getNextIndex(size, i + 2));
2688
2689 final int vx = pointNext[0] - point[0];
2690 final int vy = pointNext[1] - point[1];
2691@@ -251,9 +251,9 @@
2692 final int indexNext = getNextIndex(size, index);
2693
2694 // get points
2695- final int pointPrev[] = points.get(indexPrev);
2696- final int point[] = points.get(index);
2697- final int pointNext[] = points.get(indexNext);
2698+ final int[] pointPrev = points.get(indexPrev);
2699+ final int[] point = points.get(index);
2700+ final int[] pointNext = points.get(indexNext);
2701
2702 // check point to create polygon ear
2703 if (isEar(isCw, nonConvexPoints, pointPrev, point, pointNext))
2704@@ -294,7 +294,7 @@
2705 * @param C : ABC triangle
2706 * @return {@code boolean} : True, when ABC is ear of the polygon.
2707 */
2708- private static final boolean isEar(boolean isCw, List<int[]> nonConvexPoints, int A[], int B[], int C[])
2709+ private static final boolean isEar(boolean isCw, List<int[]> nonConvexPoints, int[] A, int[] B, int[] C)
2710 {
2711 // ABC triangle
2712 if (!(isConvex(isCw, A, B, C)))
2713@@ -318,7 +318,7 @@
2714 * @param C : Point, next to B.
2715 * @return {@code boolean} : True, when B is convex point.
2716 */
2717- private static final boolean isConvex(boolean isCw, int A[], int B[], int C[])
2718+ private static final boolean isConvex(boolean isCw, int[] A, int[] B, int[] C)
2719 {
2720 // get vector coordinates
2721 final int BAx = B[0] - A[0];
2722@@ -339,7 +339,7 @@
2723 * @param P : Point to be checked in ABC.
2724 * @return {@code boolean} : True, when P is inside ABC.
2725 */
2726- private static final boolean isInside(int A[], int B[], int C[], int P[])
2727+ private static final boolean isInside(int[] A, int[] B, int[] C, int[] P)
2728 {
2729 // get vector coordinates
2730 final int BAx = B[0] - A[0];
2731Index: aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/template/NpcTemplate.java
2732IDEA additional info:
2733Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2734<+>ISO-8859-1
2735===================================================================
2736--- aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/template/NpcTemplate.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2737+++ aCis_gameserver/java/net/sf/l2j/gameserver/model/actor/template/NpcTemplate.java (date 1579381340540)
2738@@ -24,7 +24,7 @@
2739
2740 public class NpcTemplate extends CreatureTemplate
2741 {
2742- public static enum SkillType
2743+ public enum SkillType
2744 {
2745 BUFF,
2746 DEBUFF,
2747@@ -36,7 +36,7 @@
2748 TELEPORT
2749 }
2750
2751- public static enum AIType
2752+ public enum AIType
2753 {
2754 DEFAULT,
2755 ARCHER,
2756@@ -45,7 +45,7 @@
2757 CORPSE
2758 }
2759
2760- public static enum Race
2761+ public enum Race
2762 {
2763 UNKNOWN,
2764 UNDEAD,
2765Index: aCis_gameserver/java/net/sf/l2j/commons/geometry/Square.java
2766IDEA additional info:
2767Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2768<+>ISO-8859-1
2769===================================================================
2770--- aCis_gameserver/java/net/sf/l2j/commons/geometry/Square.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2771+++ aCis_gameserver/java/net/sf/l2j/commons/geometry/Square.java (date 1579381341795)
2772@@ -56,11 +56,8 @@
2773 return false;
2774
2775 d = y - _y;
2776- if (d < 0 || d > _a)
2777- return false;
2778-
2779- return true;
2780- }
2781+ return d >= 0 && d <= _a;
2782+ }
2783
2784 @Override
2785 public boolean isInside(int x, int y, int z)
2786@@ -70,11 +67,8 @@
2787 return false;
2788
2789 d = y - _y;
2790- if (d < 0 || d > _a)
2791- return false;
2792-
2793- return true;
2794- }
2795+ return d >= 0 && d <= _a;
2796+ }
2797
2798 @Override
2799 public Location getRandomLocation()
2800Index: aCis_gameserver/java/net/sf/l2j/gameserver/scripting/Quest.java
2801IDEA additional info:
2802Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2803<+>ISO-8859-1
2804===================================================================
2805--- aCis_gameserver/java/net/sf/l2j/gameserver/scripting/Quest.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2806+++ aCis_gameserver/java/net/sf/l2j/gameserver/scripting/Quest.java (date 1579381242409)
2807@@ -433,8 +433,7 @@
2808 {
2809 // The sponsor is online, retrieve player instance and check distance.
2810 final Player sponsor = member.getPlayerInstance();
2811- if (sponsor != null && player.isInsideRadius(sponsor, 1500, true, false))
2812- return true;
2813+ return sponsor != null && player.isInsideRadius(sponsor, 1500, true, false);
2814 }
2815
2816 return false;
2817Index: aCis_gameserver/java/net/sf/l2j/gameserver/data/sql/PlayerInfoTable.java
2818IDEA additional info:
2819Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2820<+>ISO-8859-1
2821===================================================================
2822--- aCis_gameserver/java/net/sf/l2j/gameserver/data/sql/PlayerInfoTable.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2823+++ aCis_gameserver/java/net/sf/l2j/gameserver/data/sql/PlayerInfoTable.java (date 1579381341570)
2824@@ -85,8 +85,7 @@
2825 */
2826 public final void removePlayer(int objId)
2827 {
2828- if (_infos.containsKey(objId))
2829- _infos.remove(objId);
2830+ _infos.remove(objId);
2831 }
2832
2833 /**
2834Index: aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q330_AdeptOfTaste.java
2835IDEA additional info:
2836Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2837<+>ISO-8859-1
2838===================================================================
2839--- aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q330_AdeptOfTaste.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2840+++ aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q330_AdeptOfTaste.java (date 1579381242205)
2841@@ -184,12 +184,12 @@
2842
2843 if (Rnd.nextBoolean())
2844 {
2845- htmltext = "30469-05t" + Integer.toString(specialIngredientsNumber + 2) + ".htm";
2846+ htmltext = "30469-05t" + (specialIngredientsNumber + 2) + ".htm";
2847 dish = 1443 + specialIngredientsNumber;
2848 }
2849 else
2850 {
2851- htmltext = "30469-05t" + Integer.toString(specialIngredientsNumber + 1) + ".htm";
2852+ htmltext = "30469-05t" + (specialIngredientsNumber + 1) + ".htm";
2853 dish = 1442 + specialIngredientsNumber;
2854 }
2855
2856Index: aCis_gameserver/java/net/sf/l2j/gameserver/data/xml/MapRegionData.java
2857IDEA additional info:
2858Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2859<+>ISO-8859-1
2860===================================================================
2861--- aCis_gameserver/java/net/sf/l2j/gameserver/data/xml/MapRegionData.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2862+++ aCis_gameserver/java/net/sf/l2j/gameserver/data/xml/MapRegionData.java (date 1579381341647)
2863@@ -31,7 +31,7 @@
2864 */
2865 public class MapRegionData implements IXmlReader
2866 {
2867- public static enum TeleportType
2868+ public enum TeleportType
2869 {
2870 CASTLE,
2871 CLAN_HALL,
2872Index: aCis_gameserver/java/net/sf/l2j/gameserver/data/xml/AugmentationData.java
2873IDEA additional info:
2874Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2875<+>ISO-8859-1
2876===================================================================
2877--- aCis_gameserver/java/net/sf/l2j/gameserver/data/xml/AugmentationData.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2878+++ aCis_gameserver/java/net/sf/l2j/gameserver/data/xml/AugmentationData.java (date 1579381340644)
2879@@ -155,10 +155,10 @@
2880 while (data.hasMoreTokens())
2881 combinedValues.add(Float.parseFloat(data.nextToken()));
2882 });
2883- final float soloValuesArr[] = new float[soloValues.size()];
2884+ final float[] soloValuesArr = new float[soloValues.size()];
2885 for (int i = 0; i < soloValuesArr.length; i++)
2886 soloValuesArr[i] = soloValues.get(i);
2887- final float combinedValuesArr[] = new float[combinedValues.size()];
2888+ final float[] combinedValuesArr = new float[combinedValues.size()];
2889 for (int i = 0; i < combinedValuesArr.length; i++)
2890 combinedValuesArr[i] = combinedValues.get(i);
2891 statList.add(new AugmentationStat(Stats.valueOfXml(statName), soloValuesArr, combinedValuesArr));
2892@@ -321,7 +321,7 @@
2893 // the first 12 combined stats (14-26) is the stat 1 combined with stat 2-13
2894 // the next 11 combined stats then are stat 2 combined with stat 3-13 and so on...
2895 // to get the idea have a look @ optiondata_client-e.dat - thats where the data came from :)
2896- int stats[] = new int[2];
2897+ int[] stats = new int[2];
2898 stats[0] = 0x0000FFFF & augmentationId;
2899 stats[1] = (augmentationId >> 16);
2900
2901@@ -403,10 +403,10 @@
2902 private final Stats _stat;
2903 private final int _singleSize;
2904 private final int _combinedSize;
2905- private final float _singleValues[];
2906- private final float _combinedValues[];
2907+ private final float[] _singleValues;
2908+ private final float[] _combinedValues;
2909
2910- public AugmentationStat(Stats stat, float sValues[], float cValues[])
2911+ public AugmentationStat(Stats stat, float[] sValues, float[] cValues)
2912 {
2913 _stat = stat;
2914 _singleSize = sValues.length;
2915Index: aCis_gameserver/java/net/sf/l2j/gameserver/handler/IUserCommandHandler.java
2916IDEA additional info:
2917Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2918<+>ISO-8859-1
2919===================================================================
2920--- aCis_gameserver/java/net/sf/l2j/gameserver/handler/IUserCommandHandler.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2921+++ aCis_gameserver/java/net/sf/l2j/gameserver/handler/IUserCommandHandler.java (date 1579381341036)
2922@@ -9,10 +9,10 @@
2923 * @param id : The command id to launch.
2924 * @param player : The Player who is requesting the command.
2925 */
2926- public void useUserCommand(int id, Player player);
2927+ void useUserCommand(int id, Player player);
2928
2929 /**
2930 * @return all known user commands this handler can process.
2931 */
2932- public int[] getUserCommandList();
2933+ int[] getUserCommandList();
2934 }
2935\ No newline at end of file
2936Index: aCis_gameserver/java/net/sf/l2j/gameserver/handler/IItemHandler.java
2937IDEA additional info:
2938Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2939<+>ISO-8859-1
2940===================================================================
2941--- aCis_gameserver/java/net/sf/l2j/gameserver/handler/IItemHandler.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2942+++ aCis_gameserver/java/net/sf/l2j/gameserver/handler/IItemHandler.java (date 1579381340866)
2943@@ -10,7 +10,7 @@
2944 */
2945 public interface IItemHandler
2946 {
2947- public static final CLogger LOGGER = new CLogger(IItemHandler.class.getName());
2948+ CLogger LOGGER = new CLogger(IItemHandler.class.getName());
2949
2950 /**
2951 * Launch task associated to the item.
2952@@ -18,5 +18,5 @@
2953 * @param item ItemInstance designating the item to use
2954 * @param forceUse ctrl hold on item use
2955 */
2956- public void useItem(Playable playable, ItemInstance item, boolean forceUse);
2957+ void useItem(Playable playable, ItemInstance item, boolean forceUse);
2958 }
2959\ No newline at end of file
2960Index: aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q420_LittleWing.java
2961IDEA additional info:
2962Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2963<+>ISO-8859-1
2964===================================================================
2965--- aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q420_LittleWing.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2966+++ aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q420_LittleWing.java (date 1579381242427)
2967@@ -569,16 +569,13 @@
2968
2969 if (isDeluxe)
2970 {
2971- if (st.getQuestItemsCount(GEMSTONE_C) >= 1 && st.getQuestItemsCount(SILVER_NUGGET) >= 5 && st.getQuestItemsCount(STONE_OF_PURITY) >= 1 && st.getQuestItemsCount(TOAD_LORD_BACK_SKIN) >= 20)
2972- return true;
2973+ return st.getQuestItemsCount(GEMSTONE_C) >= 1 && st.getQuestItemsCount(SILVER_NUGGET) >= 5 && st.getQuestItemsCount(STONE_OF_PURITY) >= 1 && st.getQuestItemsCount(TOAD_LORD_BACK_SKIN) >= 20;
2974 }
2975 else
2976 {
2977- if (st.getQuestItemsCount(GEMSTONE_D) >= 1 && st.getQuestItemsCount(SILVER_NUGGET) >= 3 && st.getQuestItemsCount(TOAD_LORD_BACK_SKIN) >= 10)
2978- return true;
2979+ return st.getQuestItemsCount(GEMSTONE_D) >= 1 && st.getQuestItemsCount(SILVER_NUGGET) >= 3 && st.getQuestItemsCount(TOAD_LORD_BACK_SKIN) >= 10;
2980 }
2981- return false;
2982- }
2983+ }
2984
2985 private static void giveRandomPet(QuestState st, boolean hasFairyDust)
2986 {
2987Index: aCis_gameserver/java/net/sf/l2j/gameserver/handler/ISkillHandler.java
2988IDEA additional info:
2989Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
2990<+>ISO-8859-1
2991===================================================================
2992--- aCis_gameserver/java/net/sf/l2j/gameserver/handler/ISkillHandler.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
2993+++ aCis_gameserver/java/net/sf/l2j/gameserver/handler/ISkillHandler.java (date 1579381341492)
2994@@ -9,7 +9,7 @@
2995
2996 public interface ISkillHandler
2997 {
2998- public static final CLogger LOGGER = new CLogger(ISkillHandler.class.getName());
2999+ CLogger LOGGER = new CLogger(ISkillHandler.class.getName());
3000
3001 /**
3002 * The worker method called by a {@link Creature} when using a {@link L2Skill}.
3003@@ -17,10 +17,10 @@
3004 * @param skill : The L2Skill object itself.
3005 * @param targets : The eventual targets.
3006 */
3007- public void useSkill(Creature creature, L2Skill skill, WorldObject[] targets);
3008+ void useSkill(Creature creature, L2Skill skill, WorldObject[] targets);
3009
3010 /**
3011 * @return all known {@link L2SkillType}s.
3012 */
3013- public L2SkillType[] getSkillIds();
3014+ L2SkillType[] getSkillIds();
3015 }
3016\ No newline at end of file
3017Index: aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q646_SignsOfRevolt.java
3018IDEA additional info:
3019Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
3020<+>ISO-8859-1
3021===================================================================
3022--- aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q646_SignsOfRevolt.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
3023+++ aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q646_SignsOfRevolt.java (date 1579381242185)
3024@@ -70,7 +70,7 @@
3025 htmltext = "32016-07.htm";
3026 st.takeItems(CURSED_DOLL, -1);
3027
3028- final int reward[] = REWARDS[Integer.parseInt(event)];
3029+ final int[] reward = REWARDS[Integer.parseInt(event)];
3030 st.giveItems(reward[0], reward[1]);
3031
3032 st.playSound(QuestState.SOUND_FINISH);
3033Index: aCis_gameserver/java/net/sf/l2j/gameserver/handler/IChatHandler.java
3034IDEA additional info:
3035Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
3036<+>ISO-8859-1
3037===================================================================
3038--- aCis_gameserver/java/net/sf/l2j/gameserver/handler/IChatHandler.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
3039+++ aCis_gameserver/java/net/sf/l2j/gameserver/handler/IChatHandler.java (date 1579381341540)
3040@@ -16,11 +16,11 @@
3041 * @param target
3042 * @param text
3043 */
3044- public void handleChat(SayType type, Player activeChar, String target, String text);
3045+ void handleChat(SayType type, Player activeChar, String target, String text);
3046
3047 /**
3048 * Returns a list of all chat types registered to this handler
3049 * @return
3050 */
3051- public SayType[] getChatTypeList();
3052+ SayType[] getChatTypeList();
3053 }
3054Index: aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q617_GatherTheFlames.java
3055IDEA additional info:
3056Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
3057<+>ISO-8859-1
3058===================================================================
3059--- aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q617_GatherTheFlames.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
3060+++ aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q617_GatherTheFlames.java (date 1579381242341)
3061@@ -56,7 +56,7 @@
3062 }
3063
3064 // Rewards
3065- private static final int REWARDS[] =
3066+ private static final int[] REWARDS =
3067 {
3068 6881,
3069 6883,
3070Index: aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q604_DaimonTheWhiteEyed_Part2.java
3071IDEA additional info:
3072Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
3073<+>ISO-8859-1
3074===================================================================
3075--- aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q604_DaimonTheWhiteEyed_Part2.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
3076+++ aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q604_DaimonTheWhiteEyed_Part2.java (date 1579381242075)
3077@@ -27,7 +27,7 @@
3078 private static final int UNFINISHED_SUMMON_CRYSTAL = 7192;
3079 private static final int SUMMON_CRYSTAL = 7193;
3080 private static final int ESSENCE_OF_DAIMON = 7194;
3081- private static final int REWARDS[] =
3082+ private static final int[] REWARDS =
3083 {
3084 4595,
3085 4596,
3086Index: aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q663_SeductiveWhispers.java
3087IDEA additional info:
3088Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
3089<+>ISO-8859-1
3090===================================================================
3091--- aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q663_SeductiveWhispers.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
3092+++ aCis_gameserver/java/net/sf/l2j/gameserver/scripting/quests/Q663_SeductiveWhispers.java (date 1579381242376)
3093@@ -30,7 +30,7 @@
3094 private static final int ENCHANT_WEAPON_C = 951;
3095 private static final int ENCHANT_WEAPON_D = 955;
3096
3097- private static final int RECIPES[] =
3098+ private static final int[] RECIPES =
3099 {
3100 2353,
3101 4963,
3102@@ -44,7 +44,7 @@
3103 5007
3104 };
3105
3106- private static final int BLADES[] =
3107+ private static final int[] BLADES =
3108 {
3109 2115,
3110 4104,
3111Index: aCis_gameserver/java/net/sf/l2j/gameserver/data/cache/CrestCache.java
3112IDEA additional info:
3113Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
3114<+>ISO-8859-1
3115===================================================================
3116--- aCis_gameserver/java/net/sf/l2j/gameserver/data/cache/CrestCache.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
3117+++ aCis_gameserver/java/net/sf/l2j/gameserver/data/cache/CrestCache.java (date 1579381341269)
3118@@ -16,7 +16,7 @@
3119 */
3120 public class CrestCache
3121 {
3122- public static enum CrestType
3123+ public enum CrestType
3124 {
3125 PLEDGE("Crest_", 256),
3126 PLEDGE_LARGE("LargeCrest_", 2176),
3127@@ -25,7 +25,7 @@
3128 private final String _prefix;
3129 private final int _size;
3130
3131- private CrestType(String prefix, int size)
3132+ CrestType(String prefix, int size)
3133 {
3134 _prefix = prefix;
3135 _size = size;
3136Index: aCis_gameserver/java/net/sf/l2j/gameserver/handler/IAdminCommandHandler.java
3137IDEA additional info:
3138Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
3139<+>ISO-8859-1
3140===================================================================
3141--- aCis_gameserver/java/net/sf/l2j/gameserver/handler/IAdminCommandHandler.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
3142+++ aCis_gameserver/java/net/sf/l2j/gameserver/handler/IAdminCommandHandler.java (date 1579381341098)
3143@@ -10,11 +10,11 @@
3144 * @param command
3145 * @return command success
3146 */
3147- public boolean useAdminCommand(String command, Player activeChar);
3148+ boolean useAdminCommand(String command, Player activeChar);
3149
3150 /**
3151 * this method is called at initialization to register all the item ids automatically
3152 * @return all known itemIds
3153 */
3154- public String[] getAdminCommandList();
3155+ String[] getAdminCommandList();
3156 }
3157Index: aCis_gameserver/java/net/sf/l2j/gameserver/data/manager/LotteryManager.java
3158IDEA additional info:
3159Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
3160<+>ISO-8859-1
3161===================================================================
3162--- aCis_gameserver/java/net/sf/l2j/gameserver/data/manager/LotteryManager.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
3163+++ aCis_gameserver/java/net/sf/l2j/gameserver/data/manager/LotteryManager.java (date 1579381341512)
3164@@ -96,7 +96,7 @@
3165
3166 public static int[] decodeNumbers(int enchant, int type2)
3167 {
3168- int res[] = new int[5];
3169+ int[] res = new int[5];
3170 int id = 0;
3171 int nr = 1;
3172
3173@@ -132,7 +132,7 @@
3174
3175 public static int[] checkTicket(int id, int enchant, int type2)
3176 {
3177- int res[] =
3178+ int[] res =
3179 {
3180 0,
3181 0
3182Index: aCis_gameserver/java/net/sf/l2j/gameserver/model/trade/TradeList.java
3183IDEA additional info:
3184Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
3185<+>ISO-8859-1
3186===================================================================
3187--- aCis_gameserver/java/net/sf/l2j/gameserver/model/trade/TradeList.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
3188+++ aCis_gameserver/java/net/sf/l2j/gameserver/model/trade/TradeList.java (date 1579381341398)
3189@@ -731,11 +731,8 @@
3190 // Send inventory update packet
3191 _owner.sendPacket(ownerIU);
3192 player.sendPacket(playerIU);
3193- if (ok)
3194- return true;
3195-
3196- return false;
3197- }
3198+ return ok;
3199+ }
3200
3201 /**
3202 * Sell items to this PrivateStore list
3203Index: aCis_gameserver/java/net/sf/l2j/gameserver/data/manager/DerbyTrackManager.java
3204IDEA additional info:
3205Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
3206<+>ISO-8859-1
3207===================================================================
3208--- aCis_gameserver/java/net/sf/l2j/gameserver/data/manager/DerbyTrackManager.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
3209+++ aCis_gameserver/java/net/sf/l2j/gameserver/data/manager/DerbyTrackManager.java (date 1579381341619)
3210@@ -39,7 +39,7 @@
3211 private static final String SAVE_BETS = "REPLACE INTO mdt_bets (lane_id, bet) VALUES (?,?)";
3212 private static final String CLEAR_BETS = "UPDATE mdt_bets SET bet = 0";
3213
3214- public static enum RaceState
3215+ public enum RaceState
3216 {
3217 ACCEPTING_BETS,
3218 WAITING,
3219Index: aCis_gameserver/java/net/sf/l2j/gameserver/model/entity/Duel.java
3220IDEA additional info:
3221Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
3222<+>ISO-8859-1
3223===================================================================
3224--- aCis_gameserver/java/net/sf/l2j/gameserver/model/entity/Duel.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
3225+++ aCis_gameserver/java/net/sf/l2j/gameserver/model/entity/Duel.java (date 1579381340736)
3226@@ -27,7 +27,7 @@
3227
3228 public class Duel
3229 {
3230- public static enum DuelState
3231+ public enum DuelState
3232 {
3233 NO_DUEL,
3234 ON_COUNTDOWN,
3235@@ -39,7 +39,7 @@
3236
3237 private static final PlaySound B04_S01 = new PlaySound(1, "B04_S01");
3238
3239- private static enum DuelResult
3240+ private enum DuelResult
3241 {
3242 CONTINUE,
3243 TEAM_1_WIN,
3244@@ -472,7 +472,7 @@
3245 }
3246
3247 // Restore player conditions, but only for party duel (no matter the end) && 1vs1 which ends normally.
3248- if ((!_isPartyDuel && !abnormalEnd) || _isPartyDuel)
3249+ if (_isPartyDuel || !abnormalEnd)
3250 {
3251 for (PlayerCondition cond : _playerConditions)
3252 cond.restoreCondition(abnormalEnd);
3253Index: aCis_gameserver/java/net/sf/l2j/gameserver/data/manager/FourSepulchersManager.java
3254IDEA additional info:
3255Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
3256<+>ISO-8859-1
3257===================================================================
3258--- aCis_gameserver/java/net/sf/l2j/gameserver/data/manager/FourSepulchersManager.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
3259+++ aCis_gameserver/java/net/sf/l2j/gameserver/data/manager/FourSepulchersManager.java (date 1579381341553)
3260@@ -37,7 +37,7 @@
3261
3262 public class FourSepulchersManager
3263 {
3264- private static enum State
3265+ private enum State
3266 {
3267 ENTRY,
3268 ATTACK,
3269Index: aCis_gameserver/java/net/sf/l2j/gameserver/data/manager/FestivalOfDarknessManager.java
3270IDEA additional info:
3271Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
3272<+>ISO-8859-1
3273===================================================================
3274--- aCis_gameserver/java/net/sf/l2j/gameserver/data/manager/FestivalOfDarknessManager.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
3275+++ aCis_gameserver/java/net/sf/l2j/gameserver/data/manager/FestivalOfDarknessManager.java (date 1579381340788)
3276@@ -3241,7 +3241,7 @@
3277 _festivalCycle = rs.getInt("festival_cycle");
3278
3279 for (int i = 0; i < FESTIVAL_COUNT; i++)
3280- _accumulatedBonuses.add(i, rs.getInt("accumulated_bonus" + String.valueOf(i)));
3281+ _accumulatedBonuses.add(i, rs.getInt("accumulated_bonus" + i));
3282 }
3283 }
3284 }
3285Index: aCis_gameserver/java/net/sf/l2j/gameserver/model/IChanceSkillTrigger.java
3286IDEA additional info:
3287Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
3288<+>ISO-8859-1
3289===================================================================
3290--- aCis_gameserver/java/net/sf/l2j/gameserver/model/IChanceSkillTrigger.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
3291+++ aCis_gameserver/java/net/sf/l2j/gameserver/model/IChanceSkillTrigger.java (date 1579381340617)
3292@@ -7,11 +7,11 @@
3293 */
3294 public interface IChanceSkillTrigger
3295 {
3296- public boolean triggersChanceSkill();
3297+ boolean triggersChanceSkill();
3298
3299- public int getTriggeredChanceId();
3300+ int getTriggeredChanceId();
3301
3302- public int getTriggeredChanceLevel();
3303+ int getTriggeredChanceLevel();
3304
3305- public ChanceCondition getTriggeredChanceCondition();
3306+ ChanceCondition getTriggeredChanceCondition();
3307 }
3308\ No newline at end of file
3309Index: aCis_gameserver/java/net/sf/l2j/gameserver/model/entity/Siegable.java
3310IDEA additional info:
3311Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
3312<+>ISO-8859-1
3313===================================================================
3314--- aCis_gameserver/java/net/sf/l2j/gameserver/model/entity/Siegable.java (revision 887fa5f36adf7d168de034dab9e0a0615e70dfd5)
3315+++ aCis_gameserver/java/net/sf/l2j/gameserver/model/entity/Siegable.java (date 1579381341703)
3316@@ -9,21 +9,21 @@
3317
3318 public interface Siegable
3319 {
3320- public void startSiege();
3321+ void startSiege();
3322
3323- public void endSiege();
3324+ void endSiege();
3325
3326- public List<Clan> getAttackerClans();
3327+ List<Clan> getAttackerClans();
3328
3329- public List<Clan> getDefenderClans();
3330+ List<Clan> getDefenderClans();
3331
3332- public boolean checkSide(Clan clan, SiegeSide type);
3333+ boolean checkSide(Clan clan, SiegeSide type);
3334
3335- public boolean checkSides(Clan clan, SiegeSide... types);
3336+ boolean checkSides(Clan clan, SiegeSide... types);
3337
3338- public boolean checkSides(Clan clan);
3339+ boolean checkSides(Clan clan);
3340
3341- public Npc getFlag(Clan clan);
3342+ Npc getFlag(Clan clan);
3343
3344- public Calendar getSiegeDate();
3345+ Calendar getSiegeDate();
3346 }
3347\ No newline at end of file