Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-02-15 20:01:50 +01:00
Code Issues Projects Releases Wiki Activity

Small change, not sure if it will fix anything

Browse Source
This commit is contained in:
fullwall 2012-09-09 17:35:26 +08:00
parent 15a0319c89
commit 9a55734d8d
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/citizensnpcs/Citizens.java
View File

@ -214,7 +214,7 @@ public class Citizens extends JavaPlugin implements CitizensPlugin {
Economy.class); Economy.class);
if (provider != null && provider.getProvider() != null) { if (provider != null && provider.getProvider() != null) {
Economy economy = provider.getProvider(); Economy economy = provider.getProvider();
Bukkit.getPluginManager().registerEvents(new NPCPayListener(economy), this); Bukkit.getPluginManager().registerEvents(new PaymentListener(economy), this);
} }
} catch (NoClassDefFoundError e) { } catch (NoClassDefFoundError e) {
Messaging.log("Unable to use economy handling. Has Vault been enabled?"); Messaging.log("Unable to use economy handling. Has Vault been enabled?");

4
src/main/java/net/citizensnpcs/NPCPayListener.java → src/main/java/net/citizensnpcs/PaymentListener.java
View File

@ -12,10 +12,10 @@ import org.bukkit.event.Listener;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
public class NPCPayListener implements Listener { public class PaymentListener implements Listener {
private final Economy provider; private final Economy provider;
public NPCPayListener(Economy provider) { public PaymentListener(Economy provider) {
Preconditions.checkNotNull(provider, "provider cannot be null"); Preconditions.checkNotNull(provider, "provider cannot be null");
this.provider = provider; this.provider = provider;
} }

7
src/main/java/net/citizensnpcs/npc/ai/CitizensNavigator.java
View File

@ -26,7 +26,7 @@ public class CitizensNavigator implements Navigator {
.range(Setting.DEFAULT_PATHFINDING_RANGE.asFloat()) .range(Setting.DEFAULT_PATHFINDING_RANGE.asFloat())
.stationaryTicks(Setting.DEFAULT_STATIONARY_TICKS.asInt()); .stationaryTicks(Setting.DEFAULT_STATIONARY_TICKS.asInt());
private PathStrategy executing; private PathStrategy executing;
int lastX, lastY, lastZ; private int lastX, lastY, lastZ;
private NavigatorParameters localParams = defaultParams; private NavigatorParameters localParams = defaultParams;
private final CitizensNPC npc; private final CitizensNPC npc;
private int stationaryTicks; private int stationaryTicks;
@ -149,11 +149,10 @@ public class CitizensNavigator implements Navigator {
StuckAction action = localParams.stuckAction(); StuckAction action = localParams.stuckAction();
if (action != null) { if (action != null) {
boolean shouldContinue = action.run(npc, this); boolean shouldContinue = action.run(npc, this);
if (shouldContinue) { if (shouldContinue)
stationaryTicks = 0;
return; return;
}
} }
stationaryTicks = 0;
} }
Bukkit.getPluginManager().callEvent(new NavigationCancelEvent(this, reason)); Bukkit.getPluginManager().callEvent(new NavigationCancelEvent(this, reason));
stopNavigating(); stopNavigating();