Snowscape/Server
1
0
Fork 0
forked from 2009Scape/Server
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

fixup

Browse source
This commit is contained in:
RedSparr0w 2019-09-23 00:53:29 +12:00
parent 059032c01a
commit 47705aba6e
2 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
09HDscape-server/src/org/crandor/game/events/GlobalEventManager.java
View file

@ -8,11 +8,6 @@ import org.crandor.game.world.callback.CallBack;
import org.crandor.game.world.repository.Repository;
import org.crandor.tools.mysql.Results;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
/**
* Class to handle donated events.
*

4
09HDscape-server/src/plugin/interaction/inter/ExperienceLampInterface.java
View file

@ -5,7 +5,7 @@ import org.crandor.game.component.ComponentDefinition;
import org.crandor.game.component.ComponentPlugin;
import org.crandor.game.content.global.Lamps;
import org.crandor.game.content.skill.Skills;
import org.crandor.game.events.GlobalEventManager;
import org.crandor.game.events.GlobalEvent;
import org.crandor.game.node.entity.player.Player;
import org.crandor.game.node.entity.player.link.audio.Audio;
import org.crandor.game.node.item.Item;
@ -87,7 +87,7 @@ public final class ExperienceLampInterface extends ComponentPlugin {
experience /= 2;
}
} else {
player.getDialogueInterpreter().open(70099, new Object[] { "The lamp gives you " + (experience * (Skills.EXPERIENCE_MULTIPLIER * (GlobalEventManager.get().isActive("XP Fever") ? 2 : 1))) + " " + Skills.SKILL_NAME[skillType.skill] + " experience." });
player.getDialogueInterpreter().open(70099, new Object[] { "The lamp gives you " + (experience * (Skills.EXPERIENCE_MULTIPLIER * (GlobalEvent.XP_FEVER.isActive() ? 2 : 1))) + " " + Skills.SKILL_NAME[skillType.skill] + " experience." });
}
player.getSkills().addExperience(skillType.skill, experience, false);
}