From d87e0b0b420653d9e92e7384fbf5894203ebaf7f Mon Sep 17 00:00:00 2001 From: Jamix77 Date: Mon, 27 Jan 2020 16:58:06 +0000 Subject: [PATCH] Fixes (#71) * Fixes Fixed #11 and implemented a beta command for testing (stops the need to go into database and manually change when debugging, very slow, now one command in game, very fast) * Space to continue Does what it says on the tin! * Fixes + more What I've done this update: - Fixed tutorial island's chef giving infinite amounts of buckets and water to players - Fixed fishing without a tool. - Added the wilderness teleport lever to Edgeville south of the bank (as some have requested) - Added some useful tools for editing cache. Enjoy! * Important account register fix It appears I broke this in a previous update fixing other errors, without realisng this causes massive issues when registering accounts. Whoops. Here's the fix. --- Server/src/org/crandor/net/registry/AccountRegister.java | 2 +- Server/src/plugin/tutorial/MasterChefDialogue.java | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Server/src/org/crandor/net/registry/AccountRegister.java b/Server/src/org/crandor/net/registry/AccountRegister.java index f42e88aeb..dd6d40912 100644 --- a/Server/src/org/crandor/net/registry/AccountRegister.java +++ b/Server/src/org/crandor/net/registry/AccountRegister.java @@ -167,7 +167,7 @@ public class AccountRegister extends SQLEntryHandler { //If the management server's settings register new users with the server's clan chat //I believe if there was no entry there would be errors during the registration, hence a null entry if the setting is off - + statement.setString(7, "2009scape"); statement.executeUpdate(); SQLManager.close(statement.getConnection()); } diff --git a/Server/src/plugin/tutorial/MasterChefDialogue.java b/Server/src/plugin/tutorial/MasterChefDialogue.java index 09226f9aa..a056a9903 100644 --- a/Server/src/plugin/tutorial/MasterChefDialogue.java +++ b/Server/src/plugin/tutorial/MasterChefDialogue.java @@ -44,6 +44,14 @@ public class MasterChefDialogue extends DialoguePlugin { break; case 20: if (player.getInventory().containsAll(1933,1929)) { + Component.setUnclosable(player, interpreter.sendDialogues(npc, FacialExpression.NO_EXPRESSION, "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.")); + stage = 1; + } else { + 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.HALF_GUILTY, "Mix together the flour and water to form a dough.")); stage = 1;