diff --git a/.gitignore b/.gitignore index 17ce819ea..68e0c615a 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ CompiledServer/**/*.jar .idea/workspace.xml **/.idea/workspace.xml **/.idea/* +*.class diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 32b98553f..348e51b13 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,341 +2,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -485,7 +196,7 @@ - + - - + @@ -658,9 +368,9 @@ - - - + + + @@ -672,41 +382,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1014,13 +689,6 @@ - - - - - - - @@ -1074,18 +742,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - + + + + - + + diff --git a/CompiledServer/production/RS-2009/plugin/quest/witchs_house/NoraTHaggNPC$1.class b/CompiledServer/production/RS-2009/plugin/quest/witchs_house/NoraTHaggNPC$1.class index 76f96ec93..a8f848778 100644 Binary files a/CompiledServer/production/RS-2009/plugin/quest/witchs_house/NoraTHaggNPC$1.class and b/CompiledServer/production/RS-2009/plugin/quest/witchs_house/NoraTHaggNPC$1.class differ diff --git a/CompiledServer/production/RS-2009/plugin/quest/witchs_house/NoraTHaggNPC.class b/CompiledServer/production/RS-2009/plugin/quest/witchs_house/NoraTHaggNPC.class index 7eb89a8cb..ea9705985 100644 Binary files a/CompiledServer/production/RS-2009/plugin/quest/witchs_house/NoraTHaggNPC.class and b/CompiledServer/production/RS-2009/plugin/quest/witchs_house/NoraTHaggNPC.class differ diff --git a/Server/src/plugin/quest/witchs_house/NoraTHaggNPC.java b/Server/src/plugin/quest/witchs_house/NoraTHaggNPC.java index ff0928282..e9fba5016 100644 --- a/Server/src/plugin/quest/witchs_house/NoraTHaggNPC.java +++ b/Server/src/plugin/quest/witchs_house/NoraTHaggNPC.java @@ -10,6 +10,7 @@ import org.crandor.game.system.task.Pulse; import org.crandor.game.world.GameWorld; import org.crandor.game.world.map.Direction; import org.crandor.game.world.map.Location; +import org.crandor.game.world.map.path.Pathfinder; import org.crandor.game.world.map.path.SmartPathfinder; import org.crandor.game.world.update.flag.context.Animation; import org.crandor.game.world.update.flag.context.Graphics; @@ -87,6 +88,7 @@ public final class NoraTHaggNPC extends AbstractNPC { return 50; } + @Override public void tick() { super.tick(); @@ -99,9 +101,9 @@ public final class NoraTHaggNPC extends AbstractNPC { sendTeleport(player); } if (getLocation().equals(Location.create(2904, 3463, 0))) { - SmartPathfinder.find(this, Location.create(2930, 3463, 0)).walk(this); + Pathfinder.find(this, Location.create(2930, 3463, 0)).walk(this); } else if (getLocation().equals(Location.create(2930, 3463, 0))) { - SmartPathfinder.find(this, Location.create(2904, 3463, 0)).walk(this); + Pathfinder.find(this, Location.create(2904, 3463, 0)).walk(this); } }