Revert "Merge branch 'master' into master"

This reverts commit 43520c1958, reversing
changes made to 2e7aea3c62.
This commit is contained in:
zeruth
2019-06-22 02:38:35 -04:00
parent 43520c1958
commit c655c9f542
224 changed files with 16901 additions and 17108 deletions

View File

@@ -654,7 +654,7 @@ public class class40 {
if(var20.plane == SoundSystem.plane && Client.cycle <= var20.cycleEnd) {
if(Client.cycle >= var20.cycleStart) {
if(var20.targetIndex > 0) {
NPC var22 = Client.npcs[var20.targetIndex - 1];
Npc var22 = Client.npcs[var20.targetIndex - 1];
if(var22 != null && var22.x >= 0 && var22.x < 13312 && var22.y >= 0 && var22.y < 13312) {
var20.setDestination(var22.x, var22.y, class32.getTileHeight(var22.x, var22.y, var20.plane) - var20.endHeight, Client.cycle);
}