diff --git a/09HDscape-server/src/org/crandor/game/events/GlobalEventManager.java b/09HDscape-server/src/org/crandor/game/events/GlobalEventManager.java index 43f1318e3..514ab826c 100644 --- a/09HDscape-server/src/org/crandor/game/events/GlobalEventManager.java +++ b/09HDscape-server/src/org/crandor/game/events/GlobalEventManager.java @@ -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. * diff --git a/09HDscape-server/src/plugin/interaction/inter/ExperienceLampInterface.java b/09HDscape-server/src/plugin/interaction/inter/ExperienceLampInterface.java index e67ed1fa1..e1a204fed 100644 --- a/09HDscape-server/src/plugin/interaction/inter/ExperienceLampInterface.java +++ b/09HDscape-server/src/plugin/interaction/inter/ExperienceLampInterface.java @@ -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); }