mirror of
https://github.com/2006-Scape/2006Scape.git
synced 2026-07-03 16:49:03 +00:00
New stuff 6 (#324)
* Some stuff on weight Some stuff on weight * Cleaned some code related to trading and fixed most likely the issue where the player stays busy and cant trade till relog Cleaned some code related to trading and fixed most likely the issue where the player stays busy and cant trade till relog * removed a shitload of '== true' I did a search and replace but I manually checked the changes that were made so there shouldn't be any issue with that.
This commit is contained in:
@@ -667,7 +667,7 @@ public class NpcHandler {
|
||||
npcs[i].actionTimer = 4; // delete time
|
||||
resetPlayersInCombat(i);
|
||||
} else if (npcs[i].actionTimer == 0
|
||||
&& npcs[i].applyDead == true
|
||||
&& npcs[i].applyDead
|
||||
&& npcs[i].needRespawn == false) {
|
||||
npcs[i].needRespawn = true;
|
||||
npcs[i].actionTimer = NpcData.getRespawnTime(i); // respawn
|
||||
@@ -698,7 +698,7 @@ public class NpcHandler {
|
||||
if (player.tutorialProgress == 24) {
|
||||
handleratdeath(i);
|
||||
} else if (player.tutorialProgress == 25
|
||||
&& player.ratdied2 == true) {
|
||||
&& player.ratdied2) {
|
||||
handleratdeath2(i);
|
||||
}
|
||||
}
|
||||
@@ -744,7 +744,7 @@ public class NpcHandler {
|
||||
GameEngine.objectManager.removeObject(npcs[i].absX,
|
||||
npcs[i].absY);
|
||||
}
|
||||
} else if (npcs[i].actionTimer == 0 && npcs[i].needRespawn == true && npcs[i].npcType != 1158) {
|
||||
} else if (npcs[i].actionTimer == 0 && npcs[i].needRespawn && npcs[i].npcType != 1158) {
|
||||
if (npcs[i].spawnedBy > 0) {
|
||||
npcs[i] = null;
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user