From cad5dc4a7cb32c7e1266391fc42160190e2971bd Mon Sep 17 00:00:00 2001 From: Ethan Date: Tue, 17 Mar 2020 19:22:20 -0400 Subject: [PATCH] git ignoreupdated --- .gitignore | 1 + .idea/workspace.xml | 534 +++++------------- .../quest/witchs_house/NoraTHaggNPC$1.class | Bin 2707 -> 2707 bytes .../quest/witchs_house/NoraTHaggNPC.class | Bin 5073 -> 5068 bytes .../quest/witchs_house/NoraTHaggNPC.java | 6 +- 5 files changed, 132 insertions(+), 409 deletions(-) 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 76f96ec93e42919afb457e80a3d862d200f66088..a8f84877867e872bf2971dc6c69d048446122007 100644 GIT binary patch delta 84 zcmWN_s}4Y50D#d?Fqh2)^9tTU&?H4xy#vAhZZ!L=s+rjokH?8e*uuV5O-?XLA48KR mFGC^6qQIfVr6Qmvq9LXwrDLXNV_;|GVB-AeV&P>Kq3(bCZWG1; delta 84 zcmbO%I$3lB2PbPW13yE_W?oKKM%xMoc7{p@VTLLOHHK;iONJT-FNRu%NQOFwB!+s1 nGKL0*c7{fVi408)a~PT#mNK+3tYK(nSO*l{!O$_;pUVXR_2v_z 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 7eb89a8cb53724aee6f890e1342853c6a50f4f3a..ea97059857a4efa087b86569e9c16da98c093f2f 100644 GIT binary patch delta 220 zcmcbpenx%60d7XE$p^U=Hb3LO$H=M5AjqJ^AjY6J`7Ez9rzQg%kjKrSHCdAHyQVG! z2ZJ7i0E0e*2ZI4aD1#wGErSumYzAY7xeTTZix|upmH@?9F<4EuC@5x01PK^GOw+h%W22cJZV8s|QSy%A8VH{9hJOe*N0)r+)B10HM5ks1O`@yi9k6g0275Y8vp>kuQR6x0~?UX&7e71 zgzvki4g&{+E`tDr9)kyiK0_#j0Yfc=A;WA2BZj#QCJc)hOc|B{#aA&{PB!76#A?UD z!r(ahG`}OG>ttSmct)?uxdKj%ev>x{*f0i7ek)+b7(Q7;@Vj9QP+cqoKSLaYCPO?! z7()U>BtsHI217DKE<*}K0YfT73qu;iOonuZwLsDR3|W%{gz6ddCSMRrj}Tzv9EVQm1cRyF7V 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); } }