Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-22 18:45:29 +01:00
Code Issues Projects Releases Wiki Activity

updated to Bukkit 1.1-R2

Browse Source
This commit is contained in:
aPunch 2012-01-29 13:29:23 -06:00
parent d4977e10d2
commit 49d8034bd2
7 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.xml
View File

@ -16,8 +16,8 @@
<javac srcdir="${src}" destdir="${build}" debug="on" debuglevel="lines,vars,source" includeantruntime="false" encoding="Cp1252">
<classpath>
<pathelement path="${lib}" />
<pathelement location="${lib}/bukkit-1.1-R1-SNAPSHOT.jar" />
<pathelement location="${lib}/craftbukkit-1.1-R1-SNAPSHOT.jar" />
<pathelement location="${lib}/bukkit-1.1-R2.jar" />
<pathelement location="${lib}/craftbukkit-1.1-R2.jar" />
<pathelement location="${lib}/CitizensAPI.jar" />
<pathelement location="${lib}/junit.jar" />
<pathelement location="${lib}/hamcrest.jar" />

BIN
lib/CitizensAPI.jar
View File

Binary file not shown.

BIN
lib/bukkit-1.1-R1-SNAPSHOT.jar → lib/bukkit-1.1-R2.jar
View File

Binary file not shown.

BIN
lib/craftbukkit-1.1-R1-SNAPSHOT.jar → lib/craftbukkit-1.1-R2.jar
View File

Binary file not shown.

2
pom.xml
View File

@ -11,7 +11,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<craftbukkit.version>1.1-R1-SNAPSHOT</craftbukkit.version>
<craftbukkit.version>1.1-R2</craftbukkit.version>
<build.number>Unknown</build.number>
</properties>

2
src/net/citizensnpcs/npc/CitizensNPC.java
View File

@ -41,7 +41,7 @@ public class CitizensNPC extends AbstractNPC {
@Override
public Player getBukkitEntity() {
return getHandle().getPlayer();
return getHandle().getBukkitEntity();
}
public CraftNPC getHandle() {

3
src/net/citizensnpcs/resource/lib/CraftNPC.java
View File

@ -14,7 +14,6 @@ import net.minecraft.server.World;
import org.bukkit.craftbukkit.entity.CraftEntity;
import org.bukkit.craftbukkit.entity.CraftPlayer;
import org.bukkit.entity.Entity;
@SuppressWarnings("unchecked")
public class CraftNPC extends EntityPlayer {
@ -40,7 +39,7 @@ public class CraftNPC extends EntityPlayer {
}
@Override
public Entity getBukkitEntity() {
public CraftPlayer getBukkitEntity() {
if (this.bukkitEntity == null) {
super.getBukkitEntity();
removeFromPlayerMap(name);