This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/L2Attackable.java b/src/main/java/com/l2jserver/gameserver/model/actor/L2Attackable.java | |
index c6bd29d..f38276f 100644 | |
--- a/src/main/java/com/l2jserver/gameserver/model/actor/L2Attackable.java | |
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/L2Attackable.java | |
@@ -468,7 +468,7 @@ | |
// mob = 24, atk = 50, diff = 26 (no xp) | |
final int levelDiff = attacker.getLevel() - getLevel(); | |
- final int[] expSp = calculateExpAndSp(levelDiff, damage, totalDamage); | |
+ final int[] expSp = calculateExpAndSp(attacker.getLevel(), levelDiff, damage, totalDamage); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
### Eclipse Workspace Patch 1.0 | |
#P L2J_Server_BETA | |
Index: java/com/l2jserver/gameserver/model/multisell/PreparedEntry.java | |
=================================================================== | |
--- java/com/l2jserver/gameserver/model/multisell/PreparedEntry.java (revision 6602) | |
+++ java/com/l2jserver/gameserver/model/multisell/PreparedEntry.java (working copy) | |
@@ -81,7 +81,7 @@ | |
adenaAmount += _taxAmount; // do not forget tax | |
if (adenaAmount > 0) | |
{ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/Lisvus_GameServer/java/net/sf/l2j/gameserver/handler/VoicedCommandHandler.java b/Lisvus_GameServer/java/net/sf/l2j/gameserver/handler/VoicedCommandHandler.java | |
index 533fb58..b2455d2 100644 | |
--- a/Lisvus_GameServer/java/net/sf/l2j/gameserver/handler/VoicedCommandHandler.java | |
+++ b/Lisvus_GameServer/java/net/sf/l2j/gameserver/handler/VoicedCommandHandler.java | |
@@ -21,6 +21,7 @@ | |
import net.sf.l2j.Config; | |
import net.sf.l2j.gameserver.handler.voicedcommandhandlers.Banking; | |
import net.sf.l2j.gameserver.handler.voicedcommandhandlers.ChangePassword; | |
+import net.sf.l2j.gameserver.handler.voicedcommandhandlers.Epic; | |
import net.sf.l2j.gameserver.handler.voicedcommandhandlers.TvTCommand; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: java/config/custom.properties | |
=================================================================== | |
--- java/config/custom.properties (revision 591) | |
+++ java/config/custom.properties (working copy) | |
@@ -245,4 +245,17 @@ | |
OfflineSetNameColor = False | |
# Color of the name in offline mode (if OfflineSetNameColor = True) | |
-OfflineNameColor = 808080 | |
\ No newline at end of file |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/L2J_Server/dist/game/config/Character.properties b/L2J_Server/dist/game/config/Character.properties | |
index 1e5bcc0..5565c1c 100644 | |
--- a/L2J_Server/dist/game/config/Character.properties | |
+++ b/L2J_Server/dist/game/config/Character.properties | |
@@ -206,10 +206,6 @@ | |
# Default: False | |
AltSubClassWithoutQuests = False | |
-# Allow player to add/change subclass at all village master | |
-# Default: False |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
### Eclipse Workspace Patch 1.0 | |
#P L2J_DataPack | |
Index: dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java | |
=================================================================== | |
--- dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java (revision 18123) | |
+++ dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java (working copy) | |
@@ -22,14 +22,15 @@ | |
import java.util.logging.Level; | |
import java.util.logging.Logger; | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/L2J_Server/java/com/l2jserver/gameserver/network/clientpackets/EnterWorld.java b/L2J_Server/java/com/l2jserver/gameserver/network/clientpackets/EnterWorld.java | |
index 3d3da22..571326f 100644 | |
--- a/L2J_Server/java/com/l2jserver/gameserver/network/clientpackets/EnterWorld.java | |
+++ b/L2J_Server/java/com/l2jserver/gameserver/network/clientpackets/EnterWorld.java | |
@@ -47,6 +47,7 @@ | |
import com.l2jserver.gameserver.model.TeleportWhereType; | |
import com.l2jserver.gameserver.model.actor.instance.L2ClassMasterInstance; | |
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; | |
+import com.l2jserver.gameserver.model.entity.Castle; | |
import com.l2jserver.gameserver.model.entity.Couple; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkill.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkill.java | |
index 5b8ee2a..12b2384 100644 | |
--- a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkill.java | |
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkill.java | |
@@ -28,7 +28,6 @@ | |
import com.l2jserver.gameserver.model.L2EnchantSkillGroup.EnchantSkillHolder; | |
import com.l2jserver.gameserver.model.L2EnchantSkillLearn; | |
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; | |
-import com.l2jserver.gameserver.model.itemcontainer.Inventory; | |
import com.l2jserver.gameserver.model.items.instance.L2ItemInstance; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
/* | |
* Copyright (C) 2004-2015 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. | |
* |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: dist/game/data/scripts/village_master/Clan/9000-01.htm | |
=================================================================== | |
--- dist/game/data/scripts/village_master/Clan/9000-01.htm (revision 780) | |
+++ dist/game/data/scripts/village_master/Clan/9000-01.htm (working copy) | |
@@ -3,9 +3,6 @@ | |
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Clan 9000-03.htm">"Can I raise my clan level?"</Button> | |
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Clan 9000-04.htm">"I want to disband my clan."</Button> | |
<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Clan 9000-05.htm">"I'd like to restore my clan."</Button> | |
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_learn_clan_skills">"Can you teach me some clan skills?"</Button> | |
+<!-- <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_learn_clan_skills">"Can you teach me some clan skills?"</Button> --> |