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

Merge commit w. Mr Extremez

Browse Source
This commit is contained in:
dginovker
2020-01-27 08:02:18 -05:00
parent e2c675c392
commit 1d86d055a5
56 changed files with 1879 additions and 1221 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/com/rebotted/game/objects/impl/BrimhavenVines.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.rebotted.game.objects.impl;
import com.rebotted.game.content.skills.core.Woodcutting;
import com.rebotted.game.content.skills.woodcutting.Woodcutting;
import com.rebotted.game.players.Player;
/**
2006Redone Server/src/com/rebotted/game/objects/impl/Climbing.java
+1 -1
View File
@@ -874,7 +874,7 @@ public class Climbing {
}
public static void handleLadder(Player player) {
player.getDialogueHandler().sendOption2("Climb Up.", "Climb Down.");
player.getDialogueHandler().sendOption("Climb Up.", "Climb Down.");
player.dialogueAction = 147;
}
2006Redone Server/src/com/rebotted/game/objects/impl/OtherObjects.java
+1 -1
View File
@@ -124,7 +124,7 @@ public class OtherObjects {
@Override
public void execute(CycleEventContainer container) {
if (random == 1) {
player.getDialogueHandler().sendStatement2("Wow! A needle!", "Now what are the chances of finding that?");
player.getDialogueHandler().sendStatement("Wow! A needle!", "Now what are the chances of finding that?");
player.nextChat = 0;
player.getItemAssistant().addItem(1733, 1);
container.stop();
2006Redone Server/src/com/rebotted/game/objects/impl/SpecialObjects.java
+3 -2
View File
@@ -1,7 +1,8 @@
package com.rebotted.game.objects.impl;
import com.rebotted.GameEngine;
import com.rebotted.game.content.traveling.Desert;
import com.rebotted.game.content.traveling.DesertCactus;
import com.rebotted.game.content.traveling.DesertHeat;
import com.rebotted.game.players.Player;
import com.rebotted.world.clip.Region;
@@ -107,7 +108,7 @@ public class SpecialObjects {
coords[0] = c.objectX;
coords[1] = c.objectY;
if (c.desertWarning == false && c.absY == 3117) {
Desert.showWarning(c);
DesertHeat.showWarning(c);
c.desertWarning = true;
}
if (c.absY == 3117) {