diff --git a/Server/src/org/crandor/ServerConstants.java b/Server/src/org/crandor/ServerConstants.java index 237b12f6f..bc8d00493 100644 --- a/Server/src/org/crandor/ServerConstants.java +++ b/Server/src/org/crandor/ServerConstants.java @@ -171,4 +171,7 @@ public final class ServerConstants { */ } + public static final Boolean NEW_PLAYER_DEFAULT_CLAN = true; + public static final String SERVER_NAME = "2009Scape"; + } diff --git a/Server/src/org/crandor/net/registry/AccountRegister.java b/Server/src/org/crandor/net/registry/AccountRegister.java index e37d58c49..5186858c1 100644 --- a/Server/src/org/crandor/net/registry/AccountRegister.java +++ b/Server/src/org/crandor/net/registry/AccountRegister.java @@ -19,7 +19,6 @@ import org.crandor.game.system.task.TaskExecutor; import org.crandor.net.Constants; import org.crandor.net.IoSession; import org.crandor.net.event.LoginReadEvent; -import org.keldagrim.ServerConstants; /** * Handles the registry of new accounts. diff --git a/Server/src/plugin/interaction/inter/ExperienceLampInterface.java b/Server/src/plugin/interaction/inter/ExperienceLampInterface.java index e26efa684..4e9ea21a9 100644 --- a/Server/src/plugin/interaction/inter/ExperienceLampInterface.java +++ b/Server/src/plugin/interaction/inter/ExperienceLampInterface.java @@ -75,6 +75,7 @@ public final class ExperienceLampInterface extends ComponentPlugin { player.getAudioManager().send(SOUND); player.getInventory().remove(lamp); player.getInterfaceManager().close(); + int skillLevel = player.getSkills().getStaticLevel(skillType.skill); int modifier = 10; double experience = skillLevel * modifier; @@ -89,6 +90,7 @@ public final class ExperienceLampInterface extends ComponentPlugin { player.getDialogueInterpreter().open(70099, new Object[] { "The lamp gives you " + (experience * (player.getSkills().experienceMutiplier)) + " " + Skills.SKILL_NAME[skillType.skill] + " experience." }); } player.getSkills().addExperience(skillType.skill, experience, false); + player.getInterfaceManager().restoreTabs(); } return true; } diff --git a/Server/src/plugin/interaction/item/LampPlugin.java b/Server/src/plugin/interaction/item/LampPlugin.java index e27cfacda..d84b43c7a 100644 --- a/Server/src/plugin/interaction/item/LampPlugin.java +++ b/Server/src/plugin/interaction/item/LampPlugin.java @@ -28,6 +28,7 @@ public final class LampPlugin extends OptionHandler { public boolean handle(Player player, Node node, String option) { player.setAttribute("lamp", node); player.getInterfaceManager().open(new Component(134)); + player.getInterfaceManager().hideTabs(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 13); return true; } diff --git a/Server/src/plugin/tutorial/MasterChefDialogue.java b/Server/src/plugin/tutorial/MasterChefDialogue.java index f86a89c1f..da1a51a0c 100644 --- a/Server/src/plugin/tutorial/MasterChefDialogue.java +++ b/Server/src/plugin/tutorial/MasterChefDialogue.java @@ -45,11 +45,11 @@ public class MasterChefDialogue extends DialoguePlugin { case 20: if (player.getInventory().containsAll(1933,1929)) { Component.setUnclosable(player, interpreter.sendDialogues(npc, FacialExpression.NEUTRAL, "Mix together the flour and water to form a dough.")); - Component.setUnclosable(player, interpreter.sendDialogues(npc, FacialExpression.NO_EXPRESSION, "Mix together the flour and water to form a dough.")); + Component.setUnclosable(player, interpreter.sendDialogues(npc, FacialExpression.NEUTRAL, "Mix together the flour and water to form a dough.")); stage = 1; } else if (player.getInventory().containsItem(new Item(2307))) { - Component.setUnclosable(player, interpreter.sendDialogues(npc, FacialExpression.NO_EXPRESSION, "You already have some dough, no need", "to make more.")); + Component.setUnclosable(player, interpreter.sendDialogues(npc, FacialExpression.NEUTRAL, "You already have some dough, no need", "to make more.")); stage = 1; } else if (player.getInventory().containsItem(new Item(2307))) { @@ -66,7 +66,7 @@ public class MasterChefDialogue extends DialoguePlugin { stage = 1; } else { Component.setUnclosable(player, interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "I see you have lost your pot of flour and bucket of water,", "No worries i will supply you with more.")); - Component.setUnclosable(player, interpreter.sendDialogues(npc, FacialExpression.NO_EXPRESSION, "I see you have lost your pot of flour and bucket of water,", "No worries i will supply you with more.")); + Component.setUnclosable(player, interpreter.sendDialogues(npc, FacialExpression.NEUTRAL, "I see you have lost your pot of flour and bucket of water,", "No worries i will supply you with more.")); if (player.getInventory().freeSlots() >= 2) { player.getInventory().add(new Item(1933)); player.getInventory().add(new Item(1929));