2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-12 01:21:20 -07:00
Code Issues Projects Releases Packages Wiki Activity

Fixed a bug with slayer

Browse source
This commit is contained in:
ceikry 2021-08-11 10:05:20 -05:00
parent fdc060cbc1
commit f24d6f44f7
3 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Client/src/main/java/org/runite/client/VarpHelpers.java
View file

@ -24,7 +24,7 @@ public class VarpHelpers {
SystemLogger.logInfo(parentVarp + " - bitStart: " + lowerBound + " bitEnd: " + upperBound + " bitSize = " + (varbitSize + 1)); SystemLogger.logInfo(parentVarp + " - bitStart: " + lowerBound + " bitEnd: " + upperBound + " bitSize = " + (varbitSize + 1));
int expectedMinimumValue = Class3_Sub6.expectedMinimumValues[varbitSize]; int expectedMinimumValue = Class3_Sub6.expectedMinimumValues[varbitSize];
SystemLogger.logInfo("emv: " + expectedMinimumValue + " || vs: " + (127 + valueToSet)); SystemLogger.logInfo("emv: " + expectedMinimumValue + " || vs: " + (127 + valueToSet));
if (valueToSet < 0|| expectedMinimumValue < valueToSet) { //<-- commented out due to heavy suspicion of it being an Arios modification. Things work fine without it. if (valueToSet < 0|| expectedMinimumValue < valueToSet) {
SystemLogger.logInfo(expectedMinimumValue + " < " + valueToSet); SystemLogger.logInfo(expectedMinimumValue + " < " + valueToSet);
valueToSet = 0; valueToSet = 0;
} }

2
Server/src/main/java/core/game/node/entity/npc/NPC.java
View file

@ -513,7 +513,7 @@ public class NPC extends Entity {
if (getZoneMonitor().handleDeath(killer)) { if (getZoneMonitor().handleDeath(killer)) {
return; return;
} }
if (task != null && killer instanceof Player && ((Player) killer).getSlayer().getTask() == task) { if (task != null && killer instanceof Player && ((Player) killer).getSlayer().getTask() == task && ((Player) killer).getSlayer().hasTask()) {
((Player) killer).getSlayer().finalizeDeath(killer.asPlayer(), this); ((Player) killer).getSlayer().finalizeDeath(killer.asPlayer(), this);
} }
if (killer instanceof Player && killer.getAttribute("jobs:id",null) != null) { if (killer instanceof Player && killer.getAttribute("jobs:id",null) != null) {

4
Server/src/main/java/core/game/node/entity/skill/slayer/SlayerManager.java
View file

@ -105,10 +105,12 @@ public final class SlayerManager {
* @param npc The NPC. You're currently * @param npc The NPC. You're currently
*/ */
public void finalizeDeath(Player player, NPC npc) { public void finalizeDeath(Player player, NPC npc) {
if(hasTask()) {
player.getSkills().addExperience(Skills.SLAYER, npc.getSkills().getMaximumLifepoints()); player.getSkills().addExperience(Skills.SLAYER, npc.getSkills().getMaximumLifepoints());
decrementAmount(1); decrementAmount(1);
}
if(!hasTask()){ if(!hasTask()){
clear();
flags.setTaskStreak(flags.getTaskStreak() + 1); flags.setTaskStreak(flags.getTaskStreak() + 1);
flags.setCompletedTasks(flags.getCompletedTasks() + 1); flags.setCompletedTasks(flags.getCompletedTasks() + 1);
if ((flags.getCompletedTasks() > 4 || flags.canEarnPoints() ) && flags.getMaster() != Master.TURAEL && flags.getPoints() < 64000) { if ((flags.getCompletedTasks() > 4 || flags.canEarnPoints() ) && flags.getMaster() != Master.TURAEL && flags.getPoints() < 64000) {