Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-12-26 11:07:59 +01:00
Code Issues Projects Releases Wiki Activity

Update to 1.2.4

Browse Source
This commit is contained in:
aPunch 2012-03-22 18:49:15 -05:00
parent cba533f317
commit 079f5de742
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -11,8 +11,8 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<bukkit.version>1.2.3-R0.3-SNAPSHOT</bukkit.version> <bukkit.version>1.2.4-R0.1-SNAPSHOT</bukkit.version>
<craftbukkit.version>1.2.3-R0.3-SNAPSHOT</craftbukkit.version> <craftbukkit.version>1.2.4-R0.1-SNAPSHOT</craftbukkit.version>
<citizensapi.version>2.0-SNAPSHOT</citizensapi.version> <citizensapi.version>2.0-SNAPSHOT</citizensapi.version>
<build.number>Unknown</build.number> <build.number>Unknown</build.number>
</properties> </properties>

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

@ -46,7 +46,7 @@ import org.bukkit.plugin.java.JavaPlugin;
import com.google.common.collect.Iterators; import com.google.common.collect.Iterators;
public class Citizens extends JavaPlugin { public class Citizens extends JavaPlugin {
private static final String COMPATIBLE_MC_VERSION = "1.2.3"; private static final String COMPATIBLE_MC_VERSION = "1.2.4";
private final CommandManager commands = new CommandManager(); private final CommandManager commands = new CommandManager();
private Settings config; private Settings config;

4
src/main/java/net/citizensnpcs/npc/ai/MCNavigationStrategy.java
View File

@ -22,7 +22,7 @@ public class MCNavigationStrategy implements PathStrategy {
// navigation won't execute, and calling entity.move doesn't // navigation won't execute, and calling entity.move doesn't
// entirely fix the problem. // entirely fix the problem.
} }
navigation = npc.getHandle().ak(); navigation = npc.getHandle().al();
navigation.a(dest.getX(), dest.getY(), dest.getZ(), getSpeed(npc.getHandle())); navigation.a(dest.getX(), dest.getY(), dest.getZ(), getSpeed(npc.getHandle()));
} }
@ -32,7 +32,7 @@ public class MCNavigationStrategy implements PathStrategy {
this.entity = (EntityHumanNPC) entity; this.entity = (EntityHumanNPC) entity;
entity.onGround = true; // see above entity.onGround = true; // see above
} }
navigation = entity.ak(); navigation = entity.al();
navigation.a(target, getSpeed(entity)); navigation.a(target, getSpeed(entity));
} }

2
src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java
View File

@ -33,7 +33,7 @@ public class MCTargetStrategy implements PathStrategy {
if (target == null || target.dead) if (target == null || target.dead)
return true; return true;
new MCNavigationStrategy(handle, target).update(); new MCNavigationStrategy(handle, target).update();
handle.getControllerLook().a(target, 10.0F, handle.C()); handle.getControllerLook().a(target, 10.0F, handle.D());
if (aggro && canAttack()) { if (aggro && canAttack()) {
if (handle instanceof EntityMonster) { if (handle instanceof EntityMonster) {
((EntityMonster) handle).a(target); ((EntityMonster) handle).a(target);