2006-Scape/2006Scape
1
0
Fork 0
mirror of https://github.com/2006-Scape/2006Scape.git synced 2026-07-04 16:49:04 +00:00
Code Issues 4.5k Packages Projects Releases 10 Wiki Activity

New stuff 6 (#324)

Browse Source 
* Some stuff on weight

Some stuff on weight

* Cleaned some code related to trading and fixed most likely the issue where the player stays busy and cant trade till relog

Cleaned some code related to trading and fixed most likely the issue where the player stays busy and cant trade till relog

* removed a shitload of '== true'

I did a search and replace but I manually checked the changes that were made so there shouldn't be any issue with that.
This commit is contained in:
Gptaqbc
2019-12-25 13:01:24 -05:00
committed by Daniel Ginovker
parent 1c2deaacb6
commit 5f500280b2
38 changed files with 157 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/com/rebotted/game/dialogues/DialogueHandler.java
+6 -6
View File
@@ -76,7 +76,7 @@ public class DialogueHandler {
break;
case 4:
if (player.luthas == true && player.bananas >= 2) {
if (player.luthas && player.bananas >= 2) {
player.getItemAssistant().addOrDropItem(995, 30);
sendNpcChat1(
"Thank you for your services you have been rewarded 30 coins.",
@@ -4703,14 +4703,14 @@ public class DialogueHandler {
"for 50 coins?", player.talkingNpc,
NpcHandler.getNpcListName(player.talkingNpc));
player.nextChat = 1350;
} else if (player.hasPaid == true && player.absY > 3485
} else if (player.hasPaid && player.absY > 3485
&& player.absY < 3489) {
sendNpcChat1(
"Hello, are you interested in a free ride up the river?",
player.talkingNpc,
NpcHandler.getNpcListName(player.talkingNpc));
player.nextChat = 1350;
} else if (player.hasPaid == true) {
} else if (player.hasPaid) {
sendNpcChat1(
"Hello, are you interested in a free back down the river?",
player.talkingNpc,
@@ -4745,12 +4745,12 @@ public class DialogueHandler {
"modern");
player.hasPaid = true;
player.nextChat = 0;
} else if (player.hasPaid == true && player.absY > 3485
} else if (player.hasPaid && player.absY > 3485
&& player.absY < 3489) {
sendPlayerChat1("Yes please.");
player.getPlayerAssistant().startTeleport(2358, 3640, 0,
"modern");
} else if (player.hasPaid == true) {
} else if (player.hasPaid) {
sendPlayerChat1("Yes please.");
player.getPlayerAssistant().startTeleport(2367, 3488, 0,
"modern");
@@ -6743,7 +6743,7 @@ public class DialogueHandler {
VotingHandler.setAsReceived(client.playerName);
client.recievedMask = true;
client.nextChat = 0;
} else if (client.recievedMask == true && Constants.HALLOWEEN) {
} else if (client.recievedMask && Constants.HALLOWEEN) {
sendNpcChat2("You have already recieved a halloween mask.", "What reward would you like?", 945, "" + Constants.SERVER_NAME + " Guide");
client.nextChat = 3207;
}