lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed inability to calculate olympiad rewards.

Browse Source
This commit is contained in:
MobiusDev
2019-01-08 01:41:33 +00:00
parent 85401b7e89
commit 27322e4e87
20 changed files with 40 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java vendored
View File

@@ -36,7 +36,6 @@ import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.base.ClassId;
import com.l2jmobius.gameserver.model.entity.Hero;
import com.l2jmobius.gameserver.model.olympiad.CompetitionType;
import com.l2jmobius.gameserver.model.olympiad.Olympiad;
import com.l2jmobius.gameserver.model.olympiad.OlympiadGameManager;
@@ -172,14 +171,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
}
case "calculatePoints":
{
final int points = Olympiad.getInstance().getOlympiadTradePoint(player, false);
if (points == 0)
{
htmltext = "OlyManager-calculateNoEnough.html";
}
else if (points < 20)
{
if (Hero.getInstance().isUnclaimedHero(player.getObjectId()) || Hero.getInstance().isHero(player.getObjectId()))
if (Olympiad.getInstance().getOlympiadTradePoint(player, false) > 0)
{
htmltext = "OlyManager-calculateEnough.html";
}
@@ -187,11 +179,6 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
{
htmltext = "OlyManager-calculateNoEnough.html";
}
}
else
{
htmltext = "OlyManager-calculateEnough.html";
}
break;
}
case "calculatePointsDone":

8
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
View File

@@ -1036,14 +1036,8 @@ public class Olympiad extends ListenersContainer
return 0;
}
int points = 0;
// Hero point bonus
if (Hero.getInstance().isHero(player.getObjectId()) || Hero.getInstance().isUnclaimedHero(player.getObjectId()))
{
points += Config.ALT_OLY_HERO_POINTS;
}
int points = player.isHero() || Hero.getInstance().isUnclaimedHero(player.getObjectId()) ? Config.ALT_OLY_HERO_POINTS : 0;
// Rank point bonus
switch (_noblesRank.get(objId))
{

15
L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java vendored
View File

@@ -36,7 +36,6 @@ import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.base.ClassId;
import com.l2jmobius.gameserver.model.entity.Hero;
import com.l2jmobius.gameserver.model.olympiad.CompetitionType;
import com.l2jmobius.gameserver.model.olympiad.Olympiad;
import com.l2jmobius.gameserver.model.olympiad.OlympiadGameManager;
@@ -172,14 +171,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
}
case "calculatePoints":
{
final int points = Olympiad.getInstance().getOlympiadTradePoint(player, false);
if (points == 0)
{
htmltext = "OlyManager-calculateNoEnough.html";
}
else if (points < 20)
{
if (Hero.getInstance().isUnclaimedHero(player.getObjectId()) || Hero.getInstance().isHero(player.getObjectId()))
if (Olympiad.getInstance().getOlympiadTradePoint(player, false) > 0)
{
htmltext = "OlyManager-calculateEnough.html";
}
@@ -187,11 +179,6 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
{
htmltext = "OlyManager-calculateNoEnough.html";
}
}
else
{
htmltext = "OlyManager-calculateEnough.html";
}
break;
}
case "calculatePointsDone":

8
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
View File

@@ -1036,14 +1036,8 @@ public class Olympiad extends ListenersContainer
return 0;
}
int points = 0;
// Hero point bonus
if (Hero.getInstance().isHero(player.getObjectId()) || Hero.getInstance().isUnclaimedHero(player.getObjectId()))
{
points += Config.ALT_OLY_HERO_POINTS;
}
int points = player.isHero() || Hero.getInstance().isUnclaimedHero(player.getObjectId()) ? Config.ALT_OLY_HERO_POINTS : 0;
// Rank point bonus
switch (_noblesRank.get(objId))
{

15
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java vendored
View File

@@ -36,7 +36,6 @@ import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.base.ClassId;
import com.l2jmobius.gameserver.model.entity.Hero;
import com.l2jmobius.gameserver.model.olympiad.CompetitionType;
import com.l2jmobius.gameserver.model.olympiad.Olympiad;
import com.l2jmobius.gameserver.model.olympiad.OlympiadGameManager;
@@ -172,14 +171,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
}
case "calculatePoints":
{
final int points = Olympiad.getInstance().getOlympiadTradePoint(player, false);
if (points == 0)
{
htmltext = "OlyManager-calculateNoEnough.html";
}
else if (points < 20)
{
if (Hero.getInstance().isUnclaimedHero(player.getObjectId()) || Hero.getInstance().isHero(player.getObjectId()))
if (Olympiad.getInstance().getOlympiadTradePoint(player, false) > 0)
{
htmltext = "OlyManager-calculateEnough.html";
}
@@ -187,11 +179,6 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
{
htmltext = "OlyManager-calculateNoEnough.html";
}
}
else
{
htmltext = "OlyManager-calculateEnough.html";
}
break;
}
case "calculatePointsDone":

8
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
View File

@@ -1036,14 +1036,8 @@ public class Olympiad extends ListenersContainer
return 0;
}
int points = 0;
// Hero point bonus
if (Hero.getInstance().isHero(player.getObjectId()) || Hero.getInstance().isUnclaimedHero(player.getObjectId()))
{
points += Config.ALT_OLY_HERO_POINTS;
}
int points = player.isHero() || Hero.getInstance().isUnclaimedHero(player.getObjectId()) ? Config.ALT_OLY_HERO_POINTS : 0;
// Rank point bonus
switch (_noblesRank.get(objId))
{

15
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java vendored
View File

@@ -36,7 +36,6 @@ import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.base.ClassId;
import com.l2jmobius.gameserver.model.entity.Hero;
import com.l2jmobius.gameserver.model.olympiad.CompetitionType;
import com.l2jmobius.gameserver.model.olympiad.Olympiad;
import com.l2jmobius.gameserver.model.olympiad.OlympiadGameManager;
@@ -172,14 +171,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
}
case "calculatePoints":
{
final int points = Olympiad.getInstance().getOlympiadTradePoint(player, false);
if (points == 0)
{
htmltext = "OlyManager-calculateNoEnough.html";
}
else if (points < 20)
{
if (Hero.getInstance().isUnclaimedHero(player.getObjectId()) || Hero.getInstance().isHero(player.getObjectId()))
if (Olympiad.getInstance().getOlympiadTradePoint(player, false) > 0)
{
htmltext = "OlyManager-calculateEnough.html";
}
@@ -187,11 +179,6 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
{
htmltext = "OlyManager-calculateNoEnough.html";
}
}
else
{
htmltext = "OlyManager-calculateEnough.html";
}
break;
}
case "calculatePointsDone":

8
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
View File

@@ -1036,14 +1036,8 @@ public class Olympiad extends ListenersContainer
return 0;
}
int points = 0;
// Hero point bonus
if (Hero.getInstance().isHero(player.getObjectId()) || Hero.getInstance().isUnclaimedHero(player.getObjectId()))
{
points += Config.ALT_OLY_HERO_POINTS;
}
int points = player.isHero() || Hero.getInstance().isUnclaimedHero(player.getObjectId()) ? Config.ALT_OLY_HERO_POINTS : 0;
// Rank point bonus
switch (_noblesRank.get(objId))
{

15
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java vendored
View File

@@ -36,7 +36,6 @@ import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.base.ClassId;
import com.l2jmobius.gameserver.model.entity.Hero;
import com.l2jmobius.gameserver.model.olympiad.CompetitionType;
import com.l2jmobius.gameserver.model.olympiad.Olympiad;
import com.l2jmobius.gameserver.model.olympiad.OlympiadGameManager;
@@ -172,14 +171,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
}
case "calculatePoints":
{
final int points = Olympiad.getInstance().getOlympiadTradePoint(player, false);
if (points == 0)
{
htmltext = "OlyManager-calculateNoEnough.html";
}
else if (points < 20)
{
if (Hero.getInstance().isUnclaimedHero(player.getObjectId()) || Hero.getInstance().isHero(player.getObjectId()))
if (Olympiad.getInstance().getOlympiadTradePoint(player, false) > 0)
{
htmltext = "OlyManager-calculateEnough.html";
}
@@ -187,11 +179,6 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
{
htmltext = "OlyManager-calculateNoEnough.html";
}
}
else
{
htmltext = "OlyManager-calculateEnough.html";
}
break;
}
case "calculatePointsDone":

8
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
View File

@@ -1036,14 +1036,8 @@ public class Olympiad extends ListenersContainer
return 0;
}
int points = 0;
// Hero point bonus
if (Hero.getInstance().isHero(player.getObjectId()) || Hero.getInstance().isUnclaimedHero(player.getObjectId()))
{
points += Config.ALT_OLY_HERO_POINTS;
}
int points = player.isHero() || Hero.getInstance().isUnclaimedHero(player.getObjectId()) ? Config.ALT_OLY_HERO_POINTS : 0;
// Rank point bonus
switch (_noblesRank.get(objId))
{

15
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java vendored
View File

@@ -36,7 +36,6 @@ import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.base.ClassId;
import com.l2jmobius.gameserver.model.entity.Hero;
import com.l2jmobius.gameserver.model.olympiad.CompetitionType;
import com.l2jmobius.gameserver.model.olympiad.Olympiad;
import com.l2jmobius.gameserver.model.olympiad.OlympiadGameManager;
@@ -172,14 +171,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
}
case "calculatePoints":
{
final int points = Olympiad.getInstance().getOlympiadTradePoint(player, false);
if (points == 0)
{
htmltext = "OlyManager-calculateNoEnough.html";
}
else if (points < 20)
{
if (Hero.getInstance().isUnclaimedHero(player.getObjectId()) || Hero.getInstance().isHero(player.getObjectId()))
if (Olympiad.getInstance().getOlympiadTradePoint(player, false) > 0)
{
htmltext = "OlyManager-calculateEnough.html";
}
@@ -187,11 +179,6 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
{
htmltext = "OlyManager-calculateNoEnough.html";
}
}
else
{
htmltext = "OlyManager-calculateEnough.html";
}
break;
}
case "calculatePointsDone":

8
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
View File

@@ -1036,14 +1036,8 @@ public class Olympiad extends ListenersContainer
return 0;
}
int points = 0;
// Hero point bonus
if (Hero.getInstance().isHero(player.getObjectId()) || Hero.getInstance().isUnclaimedHero(player.getObjectId()))
{
points += Config.ALT_OLY_HERO_POINTS;
}
int points = player.isHero() || Hero.getInstance().isUnclaimedHero(player.getObjectId()) ? Config.ALT_OLY_HERO_POINTS : 0;
// Rank point bonus
switch (_noblesRank.get(objId))
{

15
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java vendored
View File

@@ -30,7 +30,6 @@ import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.entity.Hero;
import com.l2jmobius.gameserver.model.olympiad.CompetitionType;
import com.l2jmobius.gameserver.model.olympiad.Olympiad;
import com.l2jmobius.gameserver.model.olympiad.OlympiadGameManager;
@@ -136,14 +135,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
}
case "calculatePoints":
{
final int points = Olympiad.getInstance().getOlympiadTradePoint(player, false);
if (points == 0)
{
htmltext = "OlyManager-calculateNoEnough.html";
}
else if (points < 20)
{
if (Hero.getInstance().isUnclaimedHero(player.getObjectId()) || Hero.getInstance().isHero(player.getObjectId()))
if (Olympiad.getInstance().getOlympiadTradePoint(player, false) > 0)
{
htmltext = "OlyManager-calculateEnough.html";
}
@@ -151,11 +143,6 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
{
htmltext = "OlyManager-calculateNoEnough.html";
}
}
else
{
htmltext = "OlyManager-calculateEnough.html";
}
break;
}
case "calculatePointsDone":

8
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
View File

@@ -1041,14 +1041,8 @@ public class Olympiad extends ListenersContainer
return 0;
}
int points = 0;
// Hero point bonus
if (Hero.getInstance().isHero(player.getObjectId()) || Hero.getInstance().isUnclaimedHero(player.getObjectId()))
{
points += Config.ALT_OLY_HERO_POINTS;
}
int points = player.isHero() || Hero.getInstance().isUnclaimedHero(player.getObjectId()) ? Config.ALT_OLY_HERO_POINTS : 0;
// Rank point bonus
switch (_noblesRank.get(objId))
{

15
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java vendored
View File

@@ -30,7 +30,6 @@ import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.entity.Hero;
import com.l2jmobius.gameserver.model.olympiad.CompetitionType;
import com.l2jmobius.gameserver.model.olympiad.Olympiad;
import com.l2jmobius.gameserver.model.olympiad.OlympiadGameManager;
@@ -136,14 +135,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
}
case "calculatePoints":
{
final int points = Olympiad.getInstance().getOlympiadTradePoint(player, false);
if (points == 0)
{
htmltext = "OlyManager-calculateNoEnough.html";
}
else if (points < 20)
{
if (Hero.getInstance().isUnclaimedHero(player.getObjectId()) || Hero.getInstance().isHero(player.getObjectId()))
if (Olympiad.getInstance().getOlympiadTradePoint(player, false) > 0)
{
htmltext = "OlyManager-calculateEnough.html";
}
@@ -151,11 +143,6 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
{
htmltext = "OlyManager-calculateNoEnough.html";
}
}
else
{
htmltext = "OlyManager-calculateEnough.html";
}
break;
}
case "calculatePointsDone":

8
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
View File

@@ -1041,14 +1041,8 @@ public class Olympiad extends ListenersContainer
return 0;
}
int points = 0;
// Hero point bonus
if (Hero.getInstance().isHero(player.getObjectId()) || Hero.getInstance().isUnclaimedHero(player.getObjectId()))
{
points += Config.ALT_OLY_HERO_POINTS;
}
int points = player.isHero() || Hero.getInstance().isUnclaimedHero(player.getObjectId()) ? Config.ALT_OLY_HERO_POINTS : 0;
// Rank point bonus
switch (_noblesRank.get(objId))
{

15
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java vendored
View File

@@ -30,7 +30,6 @@ import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.entity.Hero;
import com.l2jmobius.gameserver.model.olympiad.CompetitionType;
import com.l2jmobius.gameserver.model.olympiad.Olympiad;
import com.l2jmobius.gameserver.model.olympiad.OlympiadGameManager;
@@ -136,14 +135,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
}
case "calculatePoints":
{
final int points = Olympiad.getInstance().getOlympiadTradePoint(player, false);
if (points == 0)
{
htmltext = "OlyManager-calculateNoEnough.html";
}
else if (points < 20)
{
if (Hero.getInstance().isUnclaimedHero(player.getObjectId()) || Hero.getInstance().isHero(player.getObjectId()))
if (Olympiad.getInstance().getOlympiadTradePoint(player, false) > 0)
{
htmltext = "OlyManager-calculateEnough.html";
}
@@ -151,11 +143,6 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
{
htmltext = "OlyManager-calculateNoEnough.html";
}
}
else
{
htmltext = "OlyManager-calculateEnough.html";
}
break;
}
case "calculatePointsDone":

8
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
View File

@@ -1041,14 +1041,8 @@ public class Olympiad extends ListenersContainer
return 0;
}
int points = 0;
// Hero point bonus
if (Hero.getInstance().isHero(player.getObjectId()) || Hero.getInstance().isUnclaimedHero(player.getObjectId()))
{
points += Config.ALT_OLY_HERO_POINTS;
}
int points = player.isHero() || Hero.getInstance().isUnclaimedHero(player.getObjectId()) ? Config.ALT_OLY_HERO_POINTS : 0;
// Rank point bonus
switch (_noblesRank.get(objId))
{

15
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java vendored
View File

@@ -30,7 +30,6 @@ import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.entity.Hero;
import com.l2jmobius.gameserver.model.olympiad.CompetitionType;
import com.l2jmobius.gameserver.model.olympiad.Olympiad;
import com.l2jmobius.gameserver.model.olympiad.OlympiadGameManager;
@@ -136,14 +135,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
}
case "calculatePoints":
{
final int points = Olympiad.getInstance().getOlympiadTradePoint(player, false);
if (points == 0)
{
htmltext = "OlyManager-calculateNoEnough.html";
}
else if (points < 20)
{
if (Hero.getInstance().isUnclaimedHero(player.getObjectId()) || Hero.getInstance().isHero(player.getObjectId()))
if (Olympiad.getInstance().getOlympiadTradePoint(player, false) > 0)
{
htmltext = "OlyManager-calculateEnough.html";
}
@@ -151,11 +143,6 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
{
htmltext = "OlyManager-calculateNoEnough.html";
}
}
else
{
htmltext = "OlyManager-calculateEnough.html";
}
break;
}
case "calculatePointsDone":

8
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
View File

@@ -1041,14 +1041,8 @@ public class Olympiad extends ListenersContainer
return 0;
}
int points = 0;
// Hero point bonus
if (Hero.getInstance().isHero(player.getObjectId()) || Hero.getInstance().isUnclaimedHero(player.getObjectId()))
{
points += Config.ALT_OLY_HERO_POINTS;
}
int points = player.isHero() || Hero.getInstance().isUnclaimedHero(player.getObjectId()) ? Config.ALT_OLY_HERO_POINTS : 0;
// Rank point bonus
switch (_noblesRank.get(objId))
{