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

Fixed an XP dupe.

Browse source 
Can't be having an XP dupe lying around so yeah, all fixed :)
This commit is contained in:
Jamix77 2020-02-23 14:49:18 +00:00
parent 5f6ab6fb4a
commit 85b00536db
5 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Server/src/org/crandor/ServerConstants.java
View file

@ -171,4 +171,7 @@ public final class ServerConstants {
*/ */
} }
public static final Boolean NEW_PLAYER_DEFAULT_CLAN = true;
public static final String SERVER_NAME = "2009Scape";
} }

1
Server/src/org/crandor/net/registry/AccountRegister.java
View file

@ -19,7 +19,6 @@ import org.crandor.game.system.task.TaskExecutor;
import org.crandor.net.Constants; import org.crandor.net.Constants;
import org.crandor.net.IoSession; import org.crandor.net.IoSession;
import org.crandor.net.event.LoginReadEvent; import org.crandor.net.event.LoginReadEvent;
import org.keldagrim.ServerConstants;
/** /**
* Handles the registry of new accounts. * Handles the registry of new accounts.

2
Server/src/plugin/interaction/inter/ExperienceLampInterface.java
View file

@ -75,6 +75,7 @@ public final class ExperienceLampInterface extends ComponentPlugin {
player.getAudioManager().send(SOUND); player.getAudioManager().send(SOUND);
player.getInventory().remove(lamp); player.getInventory().remove(lamp);
player.getInterfaceManager().close(); player.getInterfaceManager().close();
int skillLevel = player.getSkills().getStaticLevel(skillType.skill); int skillLevel = player.getSkills().getStaticLevel(skillType.skill);
int modifier = 10; int modifier = 10;
double experience = skillLevel * modifier; 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.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.getSkills().addExperience(skillType.skill, experience, false);
player.getInterfaceManager().restoreTabs();
} }
return true; return true;
} }

1
Server/src/plugin/interaction/item/LampPlugin.java
View file

@ -28,6 +28,7 @@ public final class LampPlugin extends OptionHandler {
public boolean handle(Player player, Node node, String option) { public boolean handle(Player player, Node node, String option) {
player.setAttribute("lamp", node); player.setAttribute("lamp", node);
player.getInterfaceManager().open(new Component(134)); player.getInterfaceManager().open(new Component(134));
player.getInterfaceManager().hideTabs(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 13);
return true; return true;
} }

6
Server/src/plugin/tutorial/MasterChefDialogue.java
View file

@ -45,11 +45,11 @@ public class MasterChefDialogue extends DialoguePlugin {
case 20: case 20:
if (player.getInventory().containsAll(1933,1929)) { 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.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; stage = 1;
} else if (player.getInventory().containsItem(new Item(2307))) { } 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; stage = 1;
} else if (player.getInventory().containsItem(new Item(2307))) { } else if (player.getInventory().containsItem(new Item(2307))) {
@ -66,7 +66,7 @@ public class MasterChefDialogue extends DialoguePlugin {
stage = 1; stage = 1;
} else { } 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.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) { if (player.getInventory().freeSlots() >= 2) {
player.getInventory().add(new Item(1933)); player.getInventory().add(new Item(1933));
player.getInventory().add(new Item(1929)); player.getInventory().add(new Item(1929));