Skip to content

Commit ceec9cb

Browse files
ipkpjersiipkpjersi
committed
Commented out debugging messages
These are very helpful where they are placed, so I would strongly recommend we just leave them in the codebase with them commented out.
1 parent ba84718 commit ceec9cb

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

‎2006Scape Server/src/main/java/com/rs2/game/content/combat/CombatAssistant.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ public void attackNpc(int i) {
521521
player.followId2 = i;
522522
player.followId = 0;
523523
if (!player.usingRangeWeapon && !RangeData.usingHally(player) && !player.usingBow && !player.usingMagic && player.goodDistance(player.getX(), player.getY(), NpcHandler.npcs[i].getX(), NpcHandler.npcs[i].getY(), NPCDefinition.forId(NpcHandler.npcs[i].npcType).getSize())) {
524-
System.out.println("distance good! stop movement 2");
524+
//System.out.println("distance good! stop movement 2");
525525
player.stopMovement();
526526
}
527527
if (player.attackTimer <= 0) {
@@ -568,15 +568,15 @@ public void attackNpc(int i) {
568568
System.err.println("projectile path is not clear! exiting early");
569569
return;
570570
}
571-
System.out.println("npc id is " + NpcHandler.npcs[i].npcType + " with size " + NPCDefinition.forId(NpcHandler.npcs[i].npcType).getSize());
571+
//System.out.println("npc id is " + NpcHandler.npcs[i].npcType + " with size " + NPCDefinition.forId(NpcHandler.npcs[i].npcType).getSize());
572572
/**
573573
* Distances for attacking npcs
574574
*/
575575
if ((!player.goodDistance(player.getX(), player.getY(), NpcHandler.npcs[i].getX(), NpcHandler.npcs[i].getY(), 2) && RangeData.usingHally(player) && !player.usingRangeWeapon && !player.usingBow && !player.usingMagic)
576576
|| (!player.goodDistance(player.getX(), player.getY(), NpcHandler.npcs[i].getX(), NpcHandler.npcs[i].getY(), 4) && player.usingRangeWeapon && !player.usingBow && !player.usingMagic)
577577
|| (!player.goodDistance(player.getX(), player.getY(), NpcHandler.npcs[i].getX(), NpcHandler.npcs[i].getY(), NPCDefinition.forId(NpcHandler.npcs[i].npcType).getSize()) && !player.usingRangeWeapon && !RangeData.usingHally(player) && !player.usingBow && !player.usingMagic)
578578
|| (!player.goodDistance(player.getX(), player.getY(), NpcHandler.npcs[i].getX(), NpcHandler.npcs[i].getY(), 8) && (player.usingBow || player.usingMagic))) {
579-
System.err.println("npc distance check early return! probably not good");
579+
//System.err.println("npc distance check early return! probably not good");
580580
return;
581581
} else {
582582
if (player.usingMagic || player.usingBow || player.usingRangeWeapon) {

‎2006Scape Server/src/main/java/com/rs2/game/content/combat/npcs/NpcCombat.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,11 +160,11 @@ public static void attackPlayer(Player c, int i) {
160160
if (!NpcData.goodDistanceNpc(NpcHandler.npcs[i].npcId, c.getX(), c.getY(), NpcData.distanceRequired(NpcHandler.npcs[i].npcId)) || NpcData.inNpc(NpcHandler.npcs[i].npcId, c.getX(), c.getY())) {
161161
return;
162162
}
163-
System.out.println("distance seems good!");
163+
//System.out.println("distance seems good!");
164164
NpcHandler.npcs[i].facePlayer(c);
165165
boolean special = false;//specialCase(c,i);
166166
if (NpcData.checkClip(NpcHandler.npcs[i]) || special) {
167-
System.out.println("clip seems good!");
167+
//System.out.println("clip seems good!");
168168
if (c.respawnTimer <= 0) {
169169
NpcHandler.npcs[i].facePlayer(c);
170170
NpcHandler.npcs[i].attackTimer = NpcData.getNpcDelay(i);

‎2006Scape Server/src/main/java/com/rs2/game/npcs/NpcData.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -356,10 +356,10 @@ public static boolean goodDistanceNpc(int i, int x2, int y2, int distance) {
356356
Set<Integer> nearbyDirections = new HashSet<>(Arrays.asList(6, 8, 9, 10, 12, 13));
357357
boolean nearBy = nearbyDirections.contains(dir);
358358
if (Misc.goodDistance(x, y, x2, y2, nearBy && NPCDefinition.forId(NpcHandler.npcs[i].npcType).getSize() > 1 ? distance - 1 : distance)) {
359-
System.out.println("distance is good! x " + x + " y " + y + " " + " x2 " + x2 + " y2 " + y2 + " vs distance " + (nearBy ? distance - 1 : distance) + " with direction " + dir);
359+
//System.out.println("distance is good! x " + x + " y " + y + " " + " x2 " + x2 + " y2 " + y2 + " vs distance " + (nearBy ? distance - 1 : distance) + " with direction " + dir);
360360
return true;
361361
} else {
362-
System.out.println("distance is not good! x " + x + " y " + y + " " + " x2 " + x2 + " y2 " + y2 + " vs distance " + distance + " with direction " + dir);
362+
//System.out.println("distance is not good! x " + x + " y " + y + " " + " x2 " + x2 + " y2 " + y2 + " vs distance " + distance + " with direction " + dir);
363363
}
364364
}
365365
}
@@ -390,7 +390,7 @@ public static boolean checkClip(Npc n) {
390390
int dis2 = 0;
391391
final boolean melee = distanceRequired(n.npcId) == NPCDefinition.forId(n.npcType).getSize();
392392
if (NPCDefinition.forId(n.npcType).getSize() < 1 && x != x2 && y != y2) {
393-
System.err.println("checkClip exit early! return false");
393+
//System.err.println("checkClip exit early! return false");
394394
return false;
395395
}
396396
// Algorithm starts here
@@ -428,7 +428,7 @@ public static boolean checkClip(Npc n) {
428428
boolean firstCheck = false;
429429
for (int i = 0; i <= longest; i++) {
430430
if (dis2 > dis) {
431-
System.err.println("checkClip early exit, dis2 > dis " + dis2 + " > " + dis );
431+
//System.err.println("checkClip early exit, dis2 > dis " + dis2 + " > " + dis );
432432
return false;
433433
}
434434
dis2++;
@@ -446,7 +446,7 @@ public static boolean checkClip(Npc n) {
446446
if (!firstCheck) {
447447
if (melee) {
448448
if (!Region.getClipping(x, y, n.heightLevel, x3 - x, y3 - y) && !Region.getClipping(x, y, n.heightLevel, x - x3, y - y3)) {
449-
System.err.println("checkClip Region.getClipping exit early 1");
449+
//System.err.println("checkClip Region.getClipping exit early 1");
450450
return false;
451451
}
452452
}
@@ -457,7 +457,7 @@ public static boolean checkClip(Npc n) {
457457
}
458458
if (melee) {
459459
if (!Region.getClipping(x, y, n.heightLevel, x3 - x, y3 - y) && !Region.getClipping(x, y, n.heightLevel, x - x3, y - y3)) {
460-
System.err.println("checkClip Region.getClipping exit early 2");
460+
//System.err.println("checkClip Region.getClipping exit early 2");
461461
return false;
462462
}
463463
}
@@ -471,20 +471,20 @@ public static boolean checkClip(Npc n) {
471471
public static boolean inNpc(int i, int x2, int y2) {
472472
if (NpcHandler.npcs[i].size < 1) {
473473
if (x2 == NpcHandler.npcs[i].getX() && y2 == NpcHandler.npcs[i].getY()) {
474-
System.out.println("in npc 1");
474+
//System.out.println("in npc 1");
475475
return true;
476476
}
477477
} else {
478478
for (int x = NpcHandler.npcs[i].getX(); x <= NpcHandler.npcs[i].getX() + NpcHandler.npcs[i].size; x++) {
479479
for (int y = NpcHandler.npcs[i].getY(); y <= NpcHandler.npcs[i].getY() + NpcHandler.npcs[i].size; y++) {
480480
if (x2 == x && y2 == y) {
481-
System.out.println("in npc 2");
481+
//System.out.println("in npc 2");
482482
return true;
483483
}
484484
}
485485
}
486486
}
487-
System.out.println("not in npc");
487+
//System.out.println("not in npc");
488488
return false;
489489
}
490490

‎2006Scape Server/src/main/java/com/rs2/net/packets/impl/ClickNPC.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public void processPacket(final Player player, Packet packet) {
153153
return;
154154
}
155155
if (!player.usingRangeWeapon && !RangeData.usingHally(player) && !player.usingBow && !player.usingMagic && player.goodDistance(player.getX(), player.getY(), NpcHandler.npcs[player.npcIndex].getX(), NpcHandler.npcs[player.npcIndex].getY(), NPCDefinition.forId(NpcHandler.npcs[player.npcIndex].npcType).getSize())) {
156-
System.out.println("distance good! stop movement 1");
156+
//System.out.println("distance good! stop movement 1");
157157
player.stopMovement();
158158
}
159159
if (player.followId > 0) {

0 commit comments

Comments
 (0)