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

Merge pull request #111 from RedSparr0w/commands-tele

Browse Source 
Refactor commands, Add click to tele command
This commit is contained in:
Josh Shippam
2019-10-26 02:29:58 +01:00
committed by GitHub
parent 551e785b94 a0cade8735
commit 365e4a13be
3 changed files with 546 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/redone/game/players/Player.java
+1 -1
View File
@@ -82,7 +82,7 @@ public abstract class Player {
treeSpiritSpawned = false, chickenSpawned = false, clickedTree = false, filter = true, treeSpiritSpawned = false, chickenSpawned = false, clickedTree = false, filter = true,
stopPlayer = false, npcCanAttack = true, gliderOpen = false, hasSandwhichLady = false, stopPlayer = false, npcCanAttack = true, gliderOpen = false, hasSandwhichLady = false,
isHarvesting, openDuel = false, killedJad = false, canHealersRespawn = true, playerIsBusy = false, miningRock, isHarvesting, openDuel = false, killedJad = false, canHealersRespawn = true, playerIsBusy = false, miningRock,
randomEventsEnabled = false, debugMode = false; randomEventsEnabled = false, debugMode = false, clickToTele = false;
public int votePoints, thankedForDonation, saveDelay, playerKilled, gertCat, restGhost, public int votePoints, thankedForDonation, saveDelay, playerKilled, gertCat, restGhost,
romeojuliet, runeMist, vampSlayer, cookAss, doricQuest, blackKnight, romeojuliet, runeMist, vampSlayer, cookAss, doricQuest, blackKnight,
2006Redone Server/src/redone/net/packets/impl/Commands.java
+533 -486
View File
File diff suppressed because it is too large Load Diff
2006Redone Server/src/redone/net/packets/impl/Walking.java
+12 -4
View File
@@ -147,7 +147,7 @@ public class Walking implements PacketType {
} }
if((player.duelStatus >= 1 && player.duelStatus <= 4) || player.duelStatus == 6) { if((player.duelStatus >= 1 && player.duelStatus <= 4) || player.duelStatus == 6) {
if(player.duelStatus == 6) { if(player.duelStatus == 6) {
player.getDueling().claimStakedItems(); player.getDueling().claimStakedItems();
} }
return; return;
} }
@@ -165,17 +165,25 @@ public class Walking implements PacketType {
} }
player.getNewWalkCmdX()[0] = player.getNewWalkCmdY()[0] = 0; player.getNewWalkCmdX()[0] = player.getNewWalkCmdY()[0] = 0;
int firstStepX, firstStepY;
int firstStepX = player.getInStream().readSignedWordBigEndianA() if (player.clickToTele)
- player.getMapRegionX() * 8; firstStepX = player.getInStream().readSignedWordBigEndianA();
else
firstStepX = player.getInStream().readSignedWordBigEndianA()-player.getMapRegionX()*8;
for (int i = 1; i < player.newWalkCmdSteps; i++) { for (int i = 1; i < player.newWalkCmdSteps; i++) {
player.getNewWalkCmdX()[i] = player.getInStream().readSignedByte(); player.getNewWalkCmdX()[i] = player.getInStream().readSignedByte();
player.getNewWalkCmdY()[i] = player.getInStream().readSignedByte(); player.getNewWalkCmdY()[i] = player.getInStream().readSignedByte();
} }
int firstStepY = player.getInStream().readSignedWordBigEndian() - player.getMapRegionY() * 8; if (player.clickToTele)
firstStepY = player.getInStream().readSignedWordBigEndian();
else
firstStepY = player.getInStream().readSignedWordBigEndian()-player.getMapRegionY()*8;
player.setNewWalkCmdIsRunning(player.getInStream().readSignedByteC() == 1 && player.playerEnergy > 0); player.setNewWalkCmdIsRunning(player.getInStream().readSignedByteC() == 1 && player.playerEnergy > 0);
for (int i1 = 0; i1 < player.newWalkCmdSteps; i1++) { for (int i1 = 0; i1 < player.newWalkCmdSteps; i1++) {
if (player.clickToTele)
player.getPlayerAssistant().movePlayer(player.getNewWalkCmdX()[i1] + firstStepX, player.getNewWalkCmdY()[i1] + firstStepY, player.heightLevel);
player.getNewWalkCmdX()[i1] += firstStepX; player.getNewWalkCmdX()[i1] += firstStepX;
player.getNewWalkCmdY()[i1] += firstStepY; player.getNewWalkCmdY()[i1] += firstStepY;
} }