Skip to content

Instantly share code, notes, and snippets.

@Battlecruiser
Battlecruiser / core.diff
Last active September 22, 2015 11:07
Hero skills on sub
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
index 2ca7d12..4b8d3b4 100644
--- a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
@@ -6790,50 +6790,9 @@
player.setClanCreateExpiryTime(0);
}
- int clanId = rset.getInt("clanid");
player.setPowerGrade(rset.getInt("power_grade"));
@Battlecruiser
Battlecruiser / core.diff
Last active September 22, 2015 11:07
Herbs fix
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/L2Character.java b/src/main/java/com/l2jserver/gameserver/model/actor/L2Character.java
index af7a9e9..0df2ffe 100644
--- a/src/main/java/com/l2jserver/gameserver/model/actor/L2Character.java
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/L2Character.java
@@ -1847,7 +1847,7 @@
// queue herbs and potions
if (isCastingSimultaneouslyNow() && simultaneously)
{
- ThreadPoolManager.getInstance().scheduleAi(() -> doCast(skill), 100);
+ ThreadPoolManager.getInstance().scheduleAi(() -> beginCast(skill, simultaneously, target, targets), 100);
@Battlecruiser
Battlecruiser / DropList.java
Created March 22, 2015 10:37
Droplist converter
/*
* Copyright (C) 2004-2014 L2J DataPack
*
* This file is part of L2J DataPack.
*
* L2J DataPack is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
diff --git a/L2J_DataPack/dist/game/data/scripts/custom/NoblesseManager/NoblesseManager.java b/L2J_DataPack/dist/game/data/scripts/custom/NoblesseManager/NoblesseManager.java
new file mode 100644
index 0000000..98e1956
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/custom/NoblesseManager/NoblesseManager.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2004-2015 L2J DataPack
+ *
+ * This file is part of L2J DataPack.
<skill id="10256" levels="1" name="Superior HP Mastery">
<!-- STR + 2, Max HP + 606, Max CP + 296 and HP Recovery Bonus + 7.3. While sitting, HP Recovery Bonus + 7 and MP recovery bonus + 3.7. When HP falls below 60%, P. Atk. + 629. When damaged to a point, has a chance of recovering 10% of Max HP. -->
<table name="#ench1hp"> 645 685 724 764 804 843 883 922 962 1002 </table>
<table name="#ench1cp"> 315 334 353 373 392 411 431 450 469 489 </table>
<table name="#ench1pAtk"> 754 809 864 919 974 1029 1084 1139 1194 1249 </table>
<table name="#ench1regHpStanding"> 7.8 8.2 8.7 9.2 9.7 10.1 10.6 11.1 11.5 12 </table>
<table name="#ench1regHpResting"> 7.5 7.9 8.4 8.8 9.3 9.8 10.2 10.7 11.1 11.6 </table>
<table name="#ench1regMp"> 3.9 4.2 4.4 4.6 4.9 5.1 5.3 5.5 5.8 6 </table>
<table name="#enchMagicLvl"> 86 87 88 90 91 92 93 95 97 99 </table>
<set name="operateType" val="P" />
<?xml version="1.0" encoding="UTF-8"?>
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/skillTrees.xsd">
<skillTree type="awakenSaveTree" classId="97">
<skill skillName="Common Craft" skillId="1322" />
<skill skillName="Purification Field" skillId="1425" />
<skill skillName="Lucky" skillId="194" />
<skill skillName="Expertise" skillId="239" />
<skill skillName="Create Common Item" skillId="1320" />
<skill skillName="Class Change" skillId="1566" />
<skill skillName="Class Change" skillId="1567" />
diff --git a/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
index e6d7699..9dabbab 100644
--- a/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
+++ b/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
@@ -290,34 +290,7 @@ public class NpcViewMod implements IBypassHandler
final IDropItem dropItem = dropList.get(i);
if (dropItem instanceof GeneralDropItem)
{
- final GeneralDropItem generalDropItem = (GeneralDropItem) dropItem;
- final L2Item item = ItemTable.getInstance().getTemplate(generalDropItem.getItemId());
diff --git a/java/com/l2jserver/gameserver/instancemanager/TerritoryWarManager.java b/java/com/l2jserver/gameserver/instancemanager/TerritoryWarManager.java
index 29f6c91..2b9743b 100644
--- a/java/com/l2jserver/gameserver/instancemanager/TerritoryWarManager.java
+++ b/java/com/l2jserver/gameserver/instancemanager/TerritoryWarManager.java
@@ -286,6 +286,7 @@ public Calendar getTWStart()
public void setTWStartTimeInMillis(long time)
{
_startTWDate.setTimeInMillis(time);
+ GlobalVariablesManager.getInstance().set("nextTWStartDate", time);
if (_isTWInProgress)
diff --git a/dist/game/config/General.properties b/dist/game/config/General.properties
index 46b2f78..8ff2722 100644
--- a/dist/game/config/General.properties
+++ b/dist/game/config/General.properties
@@ -339,7 +339,8 @@ ClearDroppedItemTable = False
# Default: False
AutoDeleteInvalidQuestData = False
-# Setting False can improve server performance on high rate/population servers.
+# If True, allows a special handling for drops when chance raises over 100% (eg. when applying chance rates).
diff --git a/dist/game/data/scripts/handlers/targethandlers/AreaFriendly.java b/dist/game/data/scripts/handlers/targethandlers/AreaFriendly.java
index 4c0d567..21d54bc 100644
--- a/dist/game/data/scripts/handlers/targethandlers/AreaFriendly.java
+++ b/dist/game/data/scripts/handlers/targethandlers/AreaFriendly.java
@@ -146,7 +146,7 @@ private boolean checkTarget(L2Character activeChar, L2Character target)
@Override
public int compare(L2Character char1, L2Character char2)
{
- return Integer.compare((int) (char1.getCurrentHp() / char1.getMaxHp()), (int) (char2.getCurrentHp() / char2.getMaxHp()));
+ return Double.compare((char1.getCurrentHp() / char1.getMaxHp()), (char2.getCurrentHp() / char2.getMaxHp()));