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

Random fixes 2 (#294)

Browse Source 
* Make ::update automatically restart server as well

* Added toggeable snow(only activable in december), added walking queue reset when using objects changing Z, made it so the wildy warning interface is appearing when entering in wildy

For some reason the resetWalkingQueue added to the execute method wasnt doing anything so I manually added it to every interaction possible... LOL

Wildy warning interface was appearing when clicking with player in wildy. I made it so it appears straight when walking 1 tile in wildy zone. Wont appears if player logs in wildy as he already knows this shit.
This commit is contained in:
Gptaqbc
2019-12-15 19:33:03 -05:00
committed by Daniel Ginovker
parent 87eaaed36f
commit 9ed0acfb04
6 changed files with 173 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/com/rebotted/GameEngine.java
+1 -1
View File
@@ -60,7 +60,7 @@ public class GameEngine {
private static IoAcceptor acceptor;
private static ConnectionHandler connectionHandler;
private static ConnectionThrottleFilter throttleFilter;
private static boolean shutdownServer = false;
public static boolean shutdownServer = false;
public static int garbageCollectDelay = 40;
public static boolean shutdownClientHandler;
private static int serverlistenerPort;
2006Redone Server/src/com/rebotted/game/objects/impl/Climbing.java
+134 -3
View File
@@ -25,7 +25,6 @@ public class Climbing {
CycleEventHandler.getSingleton().addEvent(client, new CycleEvent() {
@Override
public void execute(CycleEventContainer container) {
client.resetWalkingQueue();
processClimbing(client);
client.getPlayerAssistant().requestUpdates();
container.stop();
@@ -45,76 +44,92 @@ public class Climbing {
case 9584:
if (client.objectX == 2932 && client.objectY == 3282) {
client.getPlayerAssistant().movePlayer(2933, 3282, 0);
client.resetWalkingQueue();
}
break;
case 272:
client.getPlayerAssistant().movePlayer(client.absX, client.absY, 1);
client.resetWalkingQueue();
break;
case 273:
client.getPlayerAssistant().movePlayer(client.absX, client.absY, 0);
client.resetWalkingQueue();
break;
case 245:
if (client.objectY == 3224) {
client.getPlayerAssistant().movePlayer(client.absX, client.absY+2, 2);
client.resetWalkingQueue();
} else if (client.objectY == 3139 || client.objectX == 2835 || client.objectX == 2963) {
client.getPlayerAssistant().movePlayer(client.absX+2, client.absY, 2);
client.resetWalkingQueue();
} else {
client.getPlayerAssistant().movePlayer(client.absX-2, client.absY, 2);
client.resetWalkingQueue();
}
break;
case 246:
if (client.objectY == 3224) {
client.getPlayerAssistant().movePlayer(client.absX, client.absY-2, 1);
client.resetWalkingQueue();
} else if (client.objectY == 3139 || client.objectX == 2835 || client.objectX == 2963) {
client.getPlayerAssistant().movePlayer(client.absX-2, client.absY, 1);;
client.getPlayerAssistant().movePlayer(client.absX-2, client.absY, 1);
client.resetWalkingQueue();
} else {
client.getPlayerAssistant().movePlayer(client.absX+2, client.absY, 1);
client.resetWalkingQueue();
}
break;
case 11888:
if (client.absX == 2908 && client.absY == 3336) {
climbUp(client);
client.resetWalkingQueue();
}
break;
case 4568:
if (client.objectX == 2506 && client.objectY == 3640) {
climbUp(client);
client.resetWalkingQueue();
}
break;
case 4569:
if (client.objectX == 2506 && client.objectY == 3640) {
handleLadder(client);
client.resetWalkingQueue();
}
break;
case 4570:
if (client.objectX == 2506 && client.objectY == 3641) {
climbDown(client);
client.resetWalkingQueue();
}
break;
case 11889:
if (client.absX == 2908 && client.absY == 3336) {
handleLadder(client);
client.resetWalkingQueue();
}
break;
case 11890:
if (client.absX == 2908 && client.absY == 3336) {
climbDown(client);
client.resetWalkingQueue();
}
break;
case 9582:
if (client.objectX == 2931 && client.objectY == 3282) {
client.getPlayerAssistant().movePlayer(2933, 3282, 1);
client.resetWalkingQueue();
}
break;
case 1722:
@@ -127,104 +142,140 @@ public class Climbing {
return;
} else if (client.absY == 3423) {
client.getPlayerAssistant().movePlayer(client.absX, 3419, 1);
client.resetWalkingQueue();
}
if (client.absX == 3098) {
client.getPlayerAssistant().movePlayer(3102, 3266, 1);
client.resetWalkingQueue();
} else if (client.absY == 3445) {
client.getPlayerAssistant().movePlayer(3260, 3449, 1);
client.resetWalkingQueue();
} else if (client.absY == 3358 && client.questPoints >= chapionsGuildRequiredQP) {
client.getPlayerAssistant().movePlayer(client.absX, 3354, 1);
client.resetWalkingQueue();
} else if (client.absY == 3358 && client.questPoints < chapionsGuildRequiredQP) {
client.getPacketSender().sendMessage("You need " + chapionsGuildRequiredQP + " quest points to use these stairs.");
} else if (client.absX == 3180) {
client.getPlayerAssistant().movePlayer(3176, client.absY, 1);
client.resetWalkingQueue();
} else if (client.absX == 3159) {
client.getPlayerAssistant().movePlayer(3155, 3435, 1);
client.resetWalkingQueue();
} else if (client.absX == 2661) {
client.getPlayerAssistant().movePlayer(2665, client.absY, 1);
client.resetWalkingQueue();
} else if (client.absY == 3083) {
client.getPlayerAssistant().movePlayer(client.absX, 3087, 2);
client.resetWalkingQueue();
} else if (client.absY == 3298) {
client.getPlayerAssistant().movePlayer(client.absX, 3294, 1);
client.resetWalkingQueue();
} else if (client.absY == 3472) {
client.getPlayerAssistant().movePlayer(client.absX, 3476, 1);
client.resetWalkingQueue();
}
break;
case 1723:
if (client.absX == 3102) {
client.getPlayerAssistant().movePlayer(3098, 3266, 0);
client.resetWalkingQueue();
} else if (client.absY == 3354 && client.questPoints >= chapionsGuildRequiredQP) {
client.getPlayerAssistant().movePlayer(client.absX, 3358, 0);
client.resetWalkingQueue();
} else if (client.absY == 3358 && client.questPoints < chapionsGuildRequiredQP) {
client.getPacketSender().sendMessage("You need " + chapionsGuildRequiredQP + " quest points to use these stairs");
} else if (client.absY == 3449) {
client.getPlayerAssistant().movePlayer(3259, 3445, 0);
client.resetWalkingQueue();
} else if (client.absX == 3155) {
client.getPlayerAssistant().movePlayer(3159, 3435, 0);
client.resetWalkingQueue();
} else if (client.absX == 2665) {
client.getPlayerAssistant().movePlayer(2661, client.absY, 0);
client.resetWalkingQueue();
} else if (client.absY == 3092) {
client.getPlayerAssistant().movePlayer(client.absX, 3088, 0);
client.resetWalkingQueue();
} else if (client.absY == 3087) {
client.getPlayerAssistant().movePlayer(client.absX, 3083, 1);
client.resetWalkingQueue();
} else if (client.absY == 3419) {
client.getPlayerAssistant().movePlayer(client.absX, 3423, 0);
client.resetWalkingQueue();
} else if (client.absX == 3176) {
client.getPlayerAssistant().movePlayer(3180, client.absY, 0);
client.resetWalkingQueue();
} else if (client.absY == 3321) {
client.getPlayerAssistant().movePlayer(client.absX, 3325, 0);
client.resetWalkingQueue();
} else if (client.absY == 3294) {
client.getPlayerAssistant().movePlayer(client.absX, 3298, 0);
client.resetWalkingQueue();
} else if (client.absY == 3476) {
client.getPlayerAssistant().movePlayer(client.absX, 3472, 0);
client.resetWalkingQueue();
}
break;
case 1733:
if (client.objectX == 2569 && client.objectY == 3122) {
client.getPlayerAssistant().movePlayer(2569, 9525, 0);
client.resetWalkingQueue();
} else if (client.absX == 3186) {
client.getPlayerAssistant().movePlayer(3190, 9834, 0);
client.resetWalkingQueue();
} else if (client.objectX == 2603 && client.objectY == 3078) {
client.getPlayerAssistant().feature("using this staircase");
client.resetWalkingQueue();
} else if (client.absX != 3186) {
client.getPlayerAssistant().movePlayer(client.absX,
client.absY + 6393, 0);
client.resetWalkingQueue();
}
break;
case 1734:
if (client.objectX == 2569 && client.objectY == 9522) {
client.getPlayerAssistant().movePlayer(2569, 3121, 0);
client.resetWalkingQueue();
} else if (client.absX == 3190) {
client.getPlayerAssistant().movePlayer(3186, 3434, 0);
client.resetWalkingQueue();
} else if (client.objectX == 3059 && client.objectY == 9776) {
client.getPlayerAssistant().movePlayer(3061,
client.absY - 6400, 0);
client.resetWalkingQueue();
} else if (client.absX != 3190) {
client.getPlayerAssistant().movePlayer(client.absX,
client.absY - 6396, 0);
client.resetWalkingQueue();
}
break;
case 1737:
if (client.absY == 3294) {
client.getPlayerAssistant().movePlayer(2661, 3291, 1);
client.resetWalkingQueue();
} else if (client.absY == 3302) {
client.getPlayerAssistant().movePlayer(2648, 3301, 1);
client.resetWalkingQueue();
} else if (client.absY == 3293) {
client.getPlayerAssistant().movePlayer(2649, 3296, 1);
client.resetWalkingQueue();
}
break;
case 1736:
if (client.absY == 3291) {
client.getPlayerAssistant().movePlayer(2662, 3294, 0);
client.resetWalkingQueue();
} else if (client.absY == 3301) {
client.getPlayerAssistant().movePlayer(2645, 3302, 0);
client.resetWalkingQueue();
} else if (client.absX == 2649) {
client.getPlayerAssistant().movePlayer(2648, 3293, 0);
client.resetWalkingQueue();
}
break;
@@ -232,18 +283,23 @@ public class Climbing {
if (client.objectX == 2445 && client.objectY == 3434) {
client.getPlayerAssistant().movePlayer(2445, 3433, 1);
client.startAnimation(CLIMB_UP);
client.resetWalkingQueue();
} else if (client.objectX == 2444 && client.objectY == 3414) {
client.getPlayerAssistant().movePlayer(2445, 3416, 1);
client.startAnimation(CLIMB_UP);
client.resetWalkingQueue();
} else if (client.objectX == 2455 && client.objectY == 3417) {
client.getPlayerAssistant().movePlayer(2457, 3417, 1);
client.startAnimation(CLIMB_UP);
client.resetWalkingQueue();
} else if (client.objectX == 2461 && client.objectY == 3416) {
client.getPlayerAssistant().movePlayer(2460, 3417, 1);
client.startAnimation(CLIMB_UP);
client.resetWalkingQueue();
} else if (client.objectX == 2440 && client.objectY == 3404) {
client.getPlayerAssistant().movePlayer(2440, 3403, 1);
client.startAnimation(CLIMB_UP);
client.resetWalkingQueue();
}
break;
@@ -251,31 +307,38 @@ public class Climbing {
if (client.objectX == 2445 && client.objectY == 3434) {
client.getPlayerAssistant().movePlayer(2445, 3433, 0);
client.startAnimation(CLIMB_DOWN);
client.resetWalkingQueue();
} else if (client.objectX == 2444 || client.objectX == 2445
&& client.objectY == 3415) {
client.getPlayerAssistant().movePlayer(2444, 3413, 0);
client.startAnimation(CLIMB_DOWN);
client.resetWalkingQueue();
} else if (client.objectX == 2456 && client.objectY == 3417) {
client.getPlayerAssistant().movePlayer(2457, 3417, 0);
client.startAnimation(CLIMB_DOWN);
client.resetWalkingQueue();
} else if (client.objectX == 2461 && client.objectY == 3417) {
client.getPlayerAssistant().movePlayer(2460, 3417, 0);
client.startAnimation(CLIMB_DOWN);
client.resetWalkingQueue();
} else if (client.objectX == 2440 && client.objectY == 3404) {
client.getPlayerAssistant().movePlayer(2440, 3403, 0);
client.startAnimation(CLIMB_DOWN);
client.resetWalkingQueue();
}
break;
case 7257:
client.getPlayerAssistant().movePlayer(3044, 4973, 1);
client.startAnimation(827);
client.getPacketSender().sendMessage("You climb down.");
client.resetWalkingQueue();
break;
case 6279:
if (client.getItemAssistant().playerHasItem(954, 1)) {
client.getPlayerAssistant().movePlayer(3206, 9379, 0);
client.startAnimation(827);
client.getPacketSender().sendMessage("You climb down.");
client.resetWalkingQueue();
} else {
client.getPacketSender().sendMessage(
"You need a rope to enter.");
@@ -285,20 +348,24 @@ public class Climbing {
case 6436:
UseOther.useUp(client, client.objectId);
client.resetWalkingQueue();
break;
case 6434:
case 5167:
UseOther.useDown(client, client.objectId);
client.resetWalkingQueue();
break;
case 1767:
if (client.objectX == 3069 && client.objectY == 3856) {
UseOther.useDown(client, client.objectId);
client.resetWalkingQueue();
}
break;
case 6439:
client.getPlayerAssistant().movePlayer(3309, 2963, 0);
client.getPacketSender().sendMessage("You climb up.");
client.resetWalkingQueue();
break;
case 2408:
@@ -311,62 +378,79 @@ public class Climbing {
client.getPlayerAssistant().movePlayer(2823, 9771, 0);
client.startAnimation(827);
client.getPacketSender().sendMessage("You climb down.");
client.resetWalkingQueue();
break;
case 2147:
client.getPlayerAssistant().movePlayer(3104, 9576, 0);
client.startAnimation(827);
client.getPacketSender().sendMessage("You climb down.");
client.resetWalkingQueue();
break;
case 2148:
client.getPlayerAssistant().movePlayer(3103, 3162, 0);
client.startAnimation(828);
client.getPacketSender().sendMessage("You climb up.");
client.resetWalkingQueue();
break;
case 4383:
client.getPlayerAssistant().movePlayer(2515, 10007, 0);
client.startAnimation(827);
client.getPacketSender().sendMessage("You climb down.");
client.resetWalkingQueue();
break;
case 5131:
client.getPlayerAssistant().movePlayer(3549, 9865, 0);
client.getPacketSender().sendMessage("You climb down.");
client.resetWalkingQueue();
break;
case 5130:
client.getPlayerAssistant().movePlayer(3543, 3463, 0);
client.getPacketSender().sendMessage("You climb up.");
client.resetWalkingQueue();
break;
case 4413:
client.getPlayerAssistant().movePlayer(2510, 3644, 0);
client.startAnimation(828);
client.getPacketSender().sendMessage("You climb up.");
client.resetWalkingQueue();
break;
case 3432:
client.getPlayerAssistant().movePlayer(3440, 9887, 0);
client.resetWalkingQueue();
break;
case 1738:
if (client.objectX == 2728 && client.objectY == 3460
&& client.heightLevel == 0) {
client.getPlayerAssistant().movePlayer(2749, 3462, 1);
client.resetWalkingQueue();
} else if (client.objectX == 2746 && client.objectY == 3460
&& client.heightLevel == 0) {
client.getPlayerAssistant().movePlayer(2745, 3461, 1);
client.resetWalkingQueue();
} else if (client.objectX == 2648 && client.objectY == 3310) {
Climbing.climbUp(client);
client.resetWalkingQueue();
} else if (client.objectX == 2673 && client.objectY == 3300) {
client.getPlayerAssistant().movePlayer(2675, 3300, 1);
client.resetWalkingQueue();
} else if (client.objectX == 3204 && client.objectY == 3207) {
client.getPlayerAssistant().movePlayer(3205, 3209, 1);
client.resetWalkingQueue();
} else if (client.objectX == 3204 && client.objectY == 3229) {
client.getPlayerAssistant().movePlayer(3205, 3228, 1);
client.resetWalkingQueue();
} else if (client.objectX == 3258 && client.objectY == 3487) {
client.getPlayerAssistant().movePlayer(3257, 3487, 1);
client.resetWalkingQueue();
} else if (client.objectX == 3144 && client.objectY == 3447 && client.playerLevel[client.playerCooking] > 31 && client.playerEquipment[client.playerHat] == 1949) {
client.getPlayerAssistant().movePlayer(3143, 3448, 1);
client.resetWalkingQueue();
} else if (client.objectX == 3010 && client.objectY == 3515) {
client.getPlayerAssistant().movePlayer(3012, 3515, 1);
client.resetWalkingQueue();
} else if (client.objectX == 2895 && client.objectY == 3513) {
client.getPlayerAssistant().movePlayer(2897, 3513, 1);
client.resetWalkingQueue();
}
break;
case 3443:
@@ -376,32 +460,41 @@ public class Climbing {
if (client.objectX == 3116 && client.objectY == 9852) {
client.getPlayerAssistant().movePlayer(3116, 3451, 0);
client.startAnimation(CLIMB_UP);
client.resetWalkingQueue();
} else if (client.objectX == 3097 && client.objectY == 9867) {
client.getPlayerAssistant().movePlayer(3096, 3468, 0);
client.startAnimation(CLIMB_UP);
client.resetWalkingQueue();
} else if (client.objectX == 3237 && client.objectY == 9858) {
client.getPlayerAssistant().movePlayer(3238, 3458, 0);
client.startAnimation(CLIMB_UP);
client.resetWalkingQueue();
} else if (client.objectX == 3088 && client.objectY == 9971) {
UseOther.useUp(client, client.objectId);
client.resetWalkingQueue();
// client.startAnimation(CLIMB_UP);
} else if (client.objectX == 3209 && client.objectY == 9616) {
// OtherObjects.useUp(client, client.objectId);
client.getPlayerAssistant().movePlayer(3209, 3215, 0);
client.startAnimation(CLIMB_UP);
client.resetWalkingQueue();
client.getPacketSender().sendMessage("You climb up.");
} else if (client.objectX == 3019 && client.objectY == 9740) {// noord
client.getPlayerAssistant().movePlayer(3019, 3341, 0);
client.startAnimation(CLIMB_UP);
client.resetWalkingQueue();
} else if (client.objectX == 3020 && client.objectY == 9739) {// oost
client.getPlayerAssistant().movePlayer(3021, 3339, 0);
client.startAnimation(CLIMB_UP);
client.resetWalkingQueue();
} else if (client.objectX == 3018 && client.objectY == 9739) {// wst
client.getPlayerAssistant().movePlayer(3017, 3339, 0);
client.startAnimation(CLIMB_UP);
client.resetWalkingQueue();
} else if (client.objectX == 3019 && client.objectY == 9738) {// zuid
client.getPlayerAssistant().movePlayer(3019, 3337, 0);
client.startAnimation(CLIMB_UP);
client.resetWalkingQueue();
} else {
UseOther.useUp(client, client.objectId);
}
@@ -409,6 +502,7 @@ public class Climbing {
case 2405:
UseOther.useUp(client, client.objectId);
client.resetWalkingQueue();
break;
case 98:
@@ -417,9 +511,11 @@ public class Climbing {
}
if (!LightSources.playerHasLightSource(client)) {
client.getPlayerAssistant().movePlayer(2641, 9740, 0);
client.resetWalkingQueue();
return;
} else if (LightSources.playerHasLightSource(client)) {
client.getPlayerAssistant().movePlayer(2641, 9764, 0);
client.resetWalkingQueue();
return;
}
break;
@@ -430,23 +526,27 @@ public class Climbing {
}
LightSources.brightness3(client);
client.getPlayerAssistant().movePlayer(2649, 9804, 0);
client.resetWalkingQueue();
break;
case 2711:
if (client.absY == 3325) {
client.getPlayerAssistant().movePlayer(client.absX, 3321, 1);
client.resetWalkingQueue();
}
break;
case 4755:
if (client.absY == 2797) {
client.getPlayerAssistant().movePlayer(client.absX, 2793, 0);
client.resetWalkingQueue();
}
break;
case 4756:
if (client.absY == 2793) {
client.getPlayerAssistant().movePlayer(client.absX, 2797, 1);
client.resetWalkingQueue();
}
break;
@@ -456,6 +556,7 @@ public class Climbing {
"You go down the trapdoor.");
client.startAnimation(827);
client.getPacketSender().closeAllWindows();
client.resetWalkingQueue();
break;
case 5492:
@@ -477,6 +578,7 @@ public class Climbing {
client.getPlayerAssistant().addSkillXP(.5,
client.playerThieving);
client.getPacketSender().closeAllWindows();
client.resetWalkingQueue();
} else if (client.getItemAssistant().playerHasItem(1523, 1)
&& Misc.random(4) > 3) {
client.getPacketSender().sendMessage(
@@ -510,41 +612,52 @@ public class Climbing {
case 11724:
if (client.absX == 2971) {
client.getPlayerAssistant().movePlayer(2968, 3348, 1);
client.resetWalkingQueue();
}
break;
case 11725:
if (client.absY == 3348) {
client.getPlayerAssistant().movePlayer(2971, 3347, 0);
client.resetWalkingQueue();
}
break;
case 1725:
if (client.absY == 3376) {
client.getPlayerAssistant().movePlayer(client.absX, 3380, 1);
client.resetWalkingQueue();
} else if (client.absX == 3285 || client.absX == 3286 && client.heightLevel == 0) {
client.getPlayerAssistant().movePlayer(client.absX, 3492, 1);
client.resetWalkingQueue();
} else if (client.absY == 3509) {
client.getPlayerAssistant().movePlayer(2751, 3513, 1);
client.resetWalkingQueue();
} else if (client.absX == 3226) {
client.getPlayerAssistant().movePlayer(3230, 3394, 1);
client.resetWalkingQueue();
}
break;
case 5096:
client.getPlayerAssistant().movePlayer(2649, 9591, 0);
client.resetWalkingQueue();
break;
case 1726:
if (client.absY == 3380 ) {
client.getPlayerAssistant().movePlayer(client.absX, 3376, 0);
client.resetWalkingQueue();
} else if (client.absY == 3513) {
client.getPlayerAssistant().movePlayer(2751, 3509, 0);
client.resetWalkingQueue();
} else if (client.absX == 3230) {
client.getPlayerAssistant().movePlayer(3226, 3394, 0);
client.resetWalkingQueue();
} else if (client.absX == 3285 || client.absX == 3286
&& client.heightLevel == 1) {
client.getPlayerAssistant().movePlayer(client.absX, 3496, 0);
client.resetWalkingQueue();
}
break;
@@ -553,6 +666,7 @@ public class Climbing {
|| client.absY == 3340 || client.absY == 3341
|| client.absY == 3342) {
climbUp(client);
client.resetWalkingQueue();
}
break;
@@ -561,16 +675,20 @@ public class Climbing {
|| client.absY == 3340 || client.absY == 3341
|| client.absY == 3342) {
climbDown(client);
client.resetWalkingQueue();
}
break;
case 11729:
if (client.objectX == 2954 && client.objectY == 3338) {
client.getPlayerAssistant().movePlayer(2956, 3338, 1);
client.resetWalkingQueue();
} else if (client.objectX == 2960 && client.objectY == 3338) {
client.getPlayerAssistant().movePlayer(2959, 3339, 2);
client.resetWalkingQueue();
} else if (client.objectX == 2957 && client.objectY == 3338) {
client.getPlayerAssistant().movePlayer(2959, 3338, 3);
client.resetWalkingQueue();
}
break;
@@ -636,6 +754,7 @@ public class Climbing {
if (client.objectX == 3077 && client.objectY == 3493) {
client.getPlayerAssistant().movePlayer(3077, 9893, 0);
client.startAnimation(827);
client.resetWalkingQueue();
client.getPacketSender().sendMessage("You climb down.");
}
break;
@@ -644,6 +763,7 @@ public class Climbing {
if (client.objectX == 3076 && client.objectY == 9893) {
client.getPlayerAssistant().movePlayer(3078, 3493, 0);
client.startAnimation(828);
client.resetWalkingQueue();
client.getPacketSender().sendMessage("You climb up.");
}
break;
@@ -661,6 +781,7 @@ public class Climbing {
player.climbDelay = System.currentTimeMillis();
player.getPacketSender().sendMessage("You climb up.");
player.startAnimation(CLIMB_UP);
player.resetWalkingQueue();
player.getPacketSender().closeAllWindows();
break;
case 0:
@@ -668,6 +789,7 @@ public class Climbing {
player.climbDelay = System.currentTimeMillis();
player.getPacketSender().sendMessage("You climb up.");
player.startAnimation(CLIMB_UP);
player.resetWalkingQueue();
player.getPacketSender().closeAllWindows();
break;
case 1:
@@ -675,6 +797,7 @@ public class Climbing {
player.climbDelay = System.currentTimeMillis();
player.getPacketSender().sendMessage("You climb up.");
player.startAnimation(CLIMB_UP);
player.resetWalkingQueue();
player.getPacketSender().closeAllWindows();
break;
case 2:
@@ -682,11 +805,13 @@ public class Climbing {
player.climbDelay = System.currentTimeMillis();
player.getPacketSender().sendMessage("You climb up.");
player.startAnimation(CLIMB_UP);
player.resetWalkingQueue();
player.getPacketSender().closeAllWindows();
break;
default:
if (player.heightLevel > 3) {
climbDown(player);
player.resetWalkingQueue();
}
player.getPacketSender().sendMessage("This object is currently not supported.");
System.out.println("Bug detected with climbing up object " + player.objectId + " objectX " + player.objectX + " objectY " + player.objectY + ".");
@@ -703,6 +828,7 @@ public class Climbing {
player.climbDelay = System.currentTimeMillis();
player.getPacketSender().sendMessage("You climb down.");
player.startAnimation(CLIMB_DOWN);
player.resetWalkingQueue();
player.getPacketSender().closeAllWindows();
}
switch (player.heightLevel) {
@@ -711,6 +837,7 @@ public class Climbing {
player.climbDelay = System.currentTimeMillis();
player.getPacketSender().sendMessage("You climb down.");
player.startAnimation(CLIMB_DOWN);
player.resetWalkingQueue();
player.getPacketSender().closeAllWindows();
break;
case 2:
@@ -718,6 +845,7 @@ public class Climbing {
player.climbDelay = System.currentTimeMillis();
player.getPacketSender().sendMessage("You climb down.");
player.startAnimation(CLIMB_DOWN);
player.resetWalkingQueue();
player.getPacketSender().closeAllWindows();
break;
case 3:
@@ -725,6 +853,7 @@ public class Climbing {
player.climbDelay = System.currentTimeMillis();
player.getPacketSender().sendMessage("You climb down.");
player.startAnimation(CLIMB_DOWN);
player.resetWalkingQueue();
player.getPacketSender().closeAllWindows();
break;
default:
@@ -746,9 +875,11 @@ public class Climbing {
if (actionButtonId == 9157) {
client.getPacketSender().sendMessage("You climb up.");
client.startAnimation(CLIMB_UP);
client.resetWalkingQueue();
} else if (actionButtonId == 9158) {
client.getPacketSender().sendMessage("You climb down.");
client.startAnimation(827);
client.resetWalkingQueue();
}
client.getPacketSender().closeAllWindows();
client.nextChat = 0;
2006Redone Server/src/com/rebotted/game/players/Player.java
+16 -2
View File
@@ -345,6 +345,8 @@ public abstract class Player {
public int totalShopItems;
public boolean isSnowy;
public void startCurrentTask(int ticksBetweenExecution, CycleEvent event) {
endCurrentTask();
currentTask = CycleEventHandler.getSingleton().addEvent(this, event, ticksBetweenExecution);
@@ -655,6 +657,7 @@ public abstract class Player {
int modY = absY > 6400 ? absY - 6400 : absY;
wildLevel = (modY - 3520) / 8 + 1;
getPacketSender().walkableInterface(197);
isSnowy = false;
if (CombatConstants.SINGLE_AND_MULTI_ZONES) {
if (inMulti()) {
getPacketSender().sendFrame126("@yel@Level: " + wildLevel,
@@ -670,6 +673,7 @@ public abstract class Player {
getPacketSender().showOption(3, 0, "Attack", 1);
} else if (inDuelArena()) {
getPacketSender().walkableInterface(201);
isSnowy = false;
if (duelStatus == 5) {
getPacketSender().showOption(3, 0, "Attack", 1);
} else {
@@ -679,14 +683,19 @@ public abstract class Player {
getPacketSender().showOption(3, 0, "Null", 1);
} else if(GameEngine.trawler.players.contains(this)) {
getPacketSender().walkableInterface(11908);
isSnowy = false;
} else if (isInBarrows() || isInBarrows2()) {
getPacketSender().sendFrame126("Kill Count: " + barrowsKillCount, 4536);
getPacketSender().walkableInterface(4535);
isSnowy = false;
} else if (inCw() || inPits) {
getPacketSender().showOption(3, 0, "Attack", 1);
} else {
getPacketSender().sendMapState(0);
getPacketSender().walkableInterface(-1);
if (!isSnowy)
{
getPacketSender().walkableInterface(-1);
}
getPacketSender().showOption(3, 0, "Null", 1);
}
}
@@ -724,7 +733,6 @@ public abstract class Player {
}
public void process() {
if (playerEnergy < 100 && System.currentTimeMillis() - lastIncrease >= getPlayerAssistant().raiseTimer()) {
playerEnergy += 1;
lastIncrease = System.currentTimeMillis();
@@ -1704,6 +1712,12 @@ public abstract class Player {
return true;
}
if (absX > 2941 && absX < 3392 && absY > 3518 && absY < 3966 || absX > 2941 && absX < 3392 && absY > 9918 && absY < 10366) {
if (!WildernessWarning) {
resetWalkingQueue();
WildernessWarning = true;
getPacketSender().sendFrame126("WARNING!", 6940);
getPacketSender().showInterface(1908);
}
return true;
}
return false;
2006Redone Server/src/com/rebotted/game/players/PlayerHandler.java
+4
View File
@@ -106,6 +106,10 @@ public class PlayerHandler {
players[i].disconnected = true;
}
}
if (updateRunning) //If there's an update intended, and that's why we kicked everyone:
{
GameEngine.shutdownServer = true;
}
}
for (int i = 0; i < PlayerHandler.players.length; i++) {
if (players[i] == null || !players[i].isActive) {
2006Redone Server/src/com/rebotted/net/packets/impl/Commands.java
+18
View File
@@ -14,6 +14,8 @@ import com.rebotted.game.players.*;
import com.rebotted.net.packets.PacketType;
import com.rebotted.util.Misc;
import com.rebotted.world.clip.Region;
import java.util.Calendar;
import java.util.GregorianCalendar;
public class Commands implements PacketType {
@@ -129,6 +131,22 @@ public class Commands implements PacketType {
case "shop":
BotHandler.playerShop(player);
break;
case "snow":
Calendar date = new GregorianCalendar();
if ((date.get(Calendar.MONTH) + 1) == 12 && !player.inWild())
{
if (player.isSnowy)
{
player.isSnowy = false;
player.getPacketSender().walkableInterface(-1);
}
else {
player.isSnowy = true;
player.getPacketSender().walkableInterface(11877);
}
player.getPacketSender().sendMessage("Happy Holidays! Type ::snow to disable/enable! (Auto-disabling in certain area)");
}
break;
case "withdrawshop":
player.getPacketSender().sendMessage("Shorter version: ::wshop");
case "wshop":
2006Redone Server/src/com/rebotted/net/packets/impl/Walking.java
-7
View File
@@ -130,13 +130,6 @@ public class Walking implements PacketType {
player.mageAllowed = true;
}
if (player.WildernessWarning == false && player.wildLevel > 0) {
player.resetWalkingQueue();
player.WildernessWarning = true;
player.getPacketSender().sendFrame126("WARNING!", 6940);
player.getPacketSender().showInterface(1908);
}
if(player.openDuel) {
Client o = (Client) PlayerHandler.players[player.duelingWith];
if(o != null) {