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

Next (#124)

Browse Source 
* Update NpcHandler.class

Fixed the diagonal safefpotting combat bug. The NPC will move when it detects that the player is standing diagonally to it.

Still have some issue around objects but that's another story.

* Update NpcHandler.java

Fixed the diagonal safefpotting combat bug. The NPC will move when it detects that the player is standing diagonally to it.

Still have some issue around objects but that's another story.

closes #47
This commit is contained in:
Gptaqbc
2019-10-27 15:12:47 -04:00
committed by Daniel Ginovker
parent 0b57ebc7db
commit dd206ece70
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/redone/game/npcs/NpcHandler.java
+19 -7
View File
@@ -1047,17 +1047,25 @@ public class NpcHandler {
&& y > npc.makeY - Constants.NPC_FOLLOW_DISTANCE) {
if (npc.heightLevel == player.heightLevel) {
if (player != null && npc != null) {
if (playerY < y) {
npc.moveX = GetMove(x, playerX);
if (playerX > x && playerY < y) {
npc.moveX = GetMove(x,playerX);//Diagonal bottom right
} else if (playerX < x && playerY < y) {
npc.moveY = GetMove(y,playerY); //Diagonal bottom left
} else if (playerX < x && playerY > y) {
npc.moveX = GetMove(x,playerX);// Diagonal top left
} else if (playerX > x && playerY > y) {
npc.moveY = GetMove(y,playerY);// Diagonal top right
} else if (playerY < y) {
npc.moveX = GetMove(x, playerX); //Move South to player
npc.moveY = GetMove(y, playerY);
} else if (playerY > y) {
npc.moveX = GetMove(x, playerX);
npc.moveX = GetMove(x, playerX); //Move North to player
npc.moveY = GetMove(y, playerY);
} else if (playerX < x) {
npc.moveX = GetMove(x, playerX);
npc.moveX = GetMove(x, playerX); //Move West to player
npc.moveY = GetMove(y, playerY);
} else if (playerX > x) {
npc.moveX = GetMove(x, playerX);
npc.moveX = GetMove(x, playerX); //Move East to player
npc.moveY = GetMove(y, playerY);
}
npc.facePlayer(playerId);
@@ -1203,12 +1211,16 @@ public class NpcHandler {
}
}
}
public static boolean goodDistance(int objectX, int objectY, int playerX,
int playerY, int distance) {
return objectX - playerX <= distance && objectX - playerX >= -distance
&& objectY - playerY <= distance
&& objectY - playerY >= -distance;
&& objectY - playerY >= -distance
&& !((objectX - playerX == distance && objectY - playerY == -distance) //Detect diagonal positioning
|| (objectX - playerX == -distance && objectY - playerY == -distance)
|| (objectX - playerX == -distance && objectY - playerY == distance)
|| (objectX - playerX == distance && objectY - playerY == distance))
;
}
public static int getMaxHit(int i) {