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

Merge

Browse Source
This commit is contained in:
fullwall 2012-03-02 18:38:39 +08:00
commit eac617e682
28 changed files with 79 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/CitizensAPI.jar
View File

Binary file not shown.

3
src/main/java/net/citizensnpcs/EventListen.java
View File

@ -103,7 +103,8 @@ public class EventListen implements Listener {
NPC npc = npcManager.getNPC(event.getEntity());
Player player = (Player) event.getTarget();
if (player.getMetadata("selected").size() == 0 || player.getMetadata("selected").get(0).asInt() != npc.getId()) {
if (!player.hasMetadata("selected") || player.getMetadata("selected").size() == 0
|| player.getMetadata("selected").get(0).asInt() != npc.getId()) {
if (player.getItemInHand().getTypeId() == Setting.SELECTION_ITEM.asInt()
&& (npc.getTrait(Owner.class).getOwner().equals(player.getName()) || player
.hasPermission("citizens.admin"))) {

3
src/main/java/net/citizensnpcs/npc/entity/CitizensBlazeNPC.java
View File

@ -4,6 +4,7 @@ import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPCManager;
import net.minecraft.server.EntityBlaze;
import net.minecraft.server.PathfinderGoalSelector;
import net.minecraft.server.World;
import org.bukkit.entity.Blaze;
@ -23,6 +24,8 @@ public class CitizensBlazeNPC extends CitizensMobNPC {
public EntityBlazeNPC(World world) {
super(world);
goalSelector = new PathfinderGoalSelector();
targetSelector = new PathfinderGoalSelector();
}
@Override

3
src/main/java/net/citizensnpcs/npc/entity/CitizensCaveSpiderNPC.java
View File

@ -4,6 +4,7 @@ import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPCManager;
import net.minecraft.server.EntityCaveSpider;
import net.minecraft.server.PathfinderGoalSelector;
import net.minecraft.server.World;
import org.bukkit.entity.CaveSpider;
@ -23,6 +24,8 @@ public class CitizensCaveSpiderNPC extends CitizensMobNPC {
public EntityCaveSpiderNPC(World world) {
super(world);
goalSelector = new PathfinderGoalSelector();
targetSelector = new PathfinderGoalSelector();
}
@Override

3
src/main/java/net/citizensnpcs/npc/entity/CitizensChickenNPC.java
View File

@ -4,6 +4,7 @@ import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPCManager;
import net.minecraft.server.EntityChicken;
import net.minecraft.server.PathfinderGoalSelector;
import net.minecraft.server.World;
import org.bukkit.entity.Chicken;
@ -23,6 +24,8 @@ public class CitizensChickenNPC extends CitizensMobNPC {
public EntityChickenNPC(World world) {
super(world);
goalSelector = new PathfinderGoalSelector();
targetSelector = new PathfinderGoalSelector();
}
@Override

3
src/main/java/net/citizensnpcs/npc/entity/CitizensCowNPC.java
View File

@ -4,6 +4,7 @@ import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPCManager;
import net.minecraft.server.EntityCow;
import net.minecraft.server.PathfinderGoalSelector;
import net.minecraft.server.World;
import org.bukkit.entity.Cow;
@ -23,6 +24,8 @@ public class CitizensCowNPC extends CitizensMobNPC {
public EntityCowNPC(World world) {
super(world);
goalSelector = new PathfinderGoalSelector();
targetSelector = new PathfinderGoalSelector();
}
@Override

3
src/main/java/net/citizensnpcs/npc/entity/CitizensCreeperNPC.java
View File

@ -4,6 +4,7 @@ import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPCManager;
import net.minecraft.server.EntityCreeper;
import net.minecraft.server.PathfinderGoalSelector;
import net.minecraft.server.World;
import org.bukkit.entity.Creeper;
@ -23,6 +24,8 @@ public class CitizensCreeperNPC extends CitizensMobNPC {
public EntityCreeperNPC(World world) {
super(world);
goalSelector = new PathfinderGoalSelector();
targetSelector = new PathfinderGoalSelector();
}
@Override

3
src/main/java/net/citizensnpcs/npc/entity/CitizensEnderDragonNPC.java
View File

@ -4,6 +4,7 @@ import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPCManager;
import net.minecraft.server.EntityEnderDragon;
import net.minecraft.server.PathfinderGoalSelector;
import net.minecraft.server.World;
import org.bukkit.entity.EnderDragon;
@ -23,6 +24,8 @@ public class CitizensEnderDragonNPC extends CitizensMobNPC {
public EntityEnderDragonNPC(World world) {
super(world);
goalSelector = new PathfinderGoalSelector();
targetSelector = new PathfinderGoalSelector();
}
@Override

3
src/main/java/net/citizensnpcs/npc/entity/CitizensEndermanNPC.java
View File

@ -4,6 +4,7 @@ import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPCManager;
import net.minecraft.server.EntityEnderman;
import net.minecraft.server.PathfinderGoalSelector;
import net.minecraft.server.World;
import org.bukkit.entity.Enderman;
@ -23,6 +24,8 @@ public class CitizensEndermanNPC extends CitizensMobNPC {
public EntityEndermanNPC(World world) {
super(world);
goalSelector = new PathfinderGoalSelector();
targetSelector = new PathfinderGoalSelector();
}
@Override

3
src/main/java/net/citizensnpcs/npc/entity/CitizensGhastNPC.java
View File

@ -4,6 +4,7 @@ import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPCManager;
import net.minecraft.server.EntityGhast;
import net.minecraft.server.PathfinderGoalSelector;
import net.minecraft.server.World;
import org.bukkit.entity.Ghast;
@ -23,6 +24,8 @@ public class CitizensGhastNPC extends CitizensMobNPC {
public EntityGhastNPC(World world) {
super(world);
goalSelector = new PathfinderGoalSelector();
targetSelector = new PathfinderGoalSelector();
}
@Override

3
src/main/java/net/citizensnpcs/npc/entity/CitizensGiantNPC.java
View File

@ -4,6 +4,7 @@ import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPCManager;
import net.minecraft.server.EntityGiantZombie;
import net.minecraft.server.PathfinderGoalSelector;
import net.minecraft.server.World;
import org.bukkit.entity.Giant;
@ -23,6 +24,8 @@ public class CitizensGiantNPC extends CitizensMobNPC {
public EntityGiantNPC(World world) {
super(world);
goalSelector = new PathfinderGoalSelector();
targetSelector = new PathfinderGoalSelector();
}
@Override

3
src/main/java/net/citizensnpcs/npc/entity/CitizensIronGolemNPC.java
View File

@ -4,6 +4,7 @@ import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPCManager;
import net.minecraft.server.EntityIronGolem;
import net.minecraft.server.PathfinderGoalSelector;
import net.minecraft.server.World;
import org.bukkit.entity.IronGolem;
@ -23,6 +24,8 @@ public class CitizensIronGolemNPC extends CitizensMobNPC {
public EntityIronGolemNPC(World world) {
super(world);
goalSelector = new PathfinderGoalSelector();
targetSelector = new PathfinderGoalSelector();
}
@Override

3
src/main/java/net/citizensnpcs/npc/entity/CitizensMagmaCubeNPC.java
View File

@ -4,6 +4,7 @@ import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPCManager;
import net.minecraft.server.EntityMagmaCube;
import net.minecraft.server.PathfinderGoalSelector;
import net.minecraft.server.World;
import org.bukkit.entity.MagmaCube;
@ -24,6 +25,8 @@ public class CitizensMagmaCubeNPC extends CitizensMobNPC {
public EntityMagmaCubeNPC(World world) {
super(world);
setSize(3);
goalSelector = new PathfinderGoalSelector();
targetSelector = new PathfinderGoalSelector();
}
@Override

3
src/main/java/net/citizensnpcs/npc/entity/CitizensMushroomCowNPC.java
View File

@ -4,6 +4,7 @@ import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPCManager;
import net.minecraft.server.EntityMushroomCow;
import net.minecraft.server.PathfinderGoalSelector;
import net.minecraft.server.World;
import org.bukkit.entity.MushroomCow;
@ -23,6 +24,8 @@ public class CitizensMushroomCowNPC extends CitizensMobNPC {
public EntityMushroomCowNPC(World world) {
super(world);
goalSelector = new PathfinderGoalSelector();
targetSelector = new PathfinderGoalSelector();
}
@Override

3
src/main/java/net/citizensnpcs/npc/entity/CitizensOcelotNPC.java
View File

@ -4,6 +4,7 @@ import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPCManager;
import net.minecraft.server.EntityOcelot;
import net.minecraft.server.PathfinderGoalSelector;
import net.minecraft.server.World;
import org.bukkit.entity.Ocelot;
@ -23,6 +24,8 @@ public class CitizensOcelotNPC extends CitizensMobNPC {
public EntityOcelotNPC(World world) {
super(world);
goalSelector = new PathfinderGoalSelector();
targetSelector = new PathfinderGoalSelector();
}
@Override

3
src/main/java/net/citizensnpcs/npc/entity/CitizensPigNPC.java
View File

@ -4,6 +4,7 @@ import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPCManager;
import net.minecraft.server.EntityPig;
import net.minecraft.server.PathfinderGoalSelector;
import net.minecraft.server.World;
import org.bukkit.entity.Pig;
@ -23,6 +24,8 @@ public class CitizensPigNPC extends CitizensMobNPC {
public EntityPigNPC(World world) {
super(world);
goalSelector = new PathfinderGoalSelector();
targetSelector = new PathfinderGoalSelector();
}
@Override

3
src/main/java/net/citizensnpcs/npc/entity/CitizensPigZombieNPC.java
View File

@ -4,6 +4,7 @@ import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPCManager;
import net.minecraft.server.EntityPigZombie;
import net.minecraft.server.PathfinderGoalSelector;
import net.minecraft.server.World;
import org.bukkit.entity.PigZombie;
@ -23,6 +24,8 @@ public class CitizensPigZombieNPC extends CitizensMobNPC {
public EntityPigZombieNPC(World world) {
super(world);
goalSelector = new PathfinderGoalSelector();
targetSelector = new PathfinderGoalSelector();
}
@Override

3
src/main/java/net/citizensnpcs/npc/entity/CitizensSheepNPC.java
View File

@ -4,6 +4,7 @@ import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPCManager;
import net.minecraft.server.EntitySheep;
import net.minecraft.server.PathfinderGoalSelector;
import net.minecraft.server.World;
import org.bukkit.entity.Sheep;
@ -23,6 +24,8 @@ public class CitizensSheepNPC extends CitizensMobNPC {
public EntitySheepNPC(World world) {
super(world);
goalSelector = new PathfinderGoalSelector();
targetSelector = new PathfinderGoalSelector();
}
@Override

3
src/main/java/net/citizensnpcs/npc/entity/CitizensSilverfishNPC.java
View File

@ -4,6 +4,7 @@ import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPCManager;
import net.minecraft.server.EntitySilverfish;
import net.minecraft.server.PathfinderGoalSelector;
import net.minecraft.server.World;
import org.bukkit.entity.Silverfish;
@ -23,6 +24,8 @@ public class CitizensSilverfishNPC extends CitizensMobNPC {
public EntitySilverfishNPC(World world) {
super(world);
goalSelector = new PathfinderGoalSelector();
targetSelector = new PathfinderGoalSelector();
}
@Override

3
src/main/java/net/citizensnpcs/npc/entity/CitizensSkeletonNPC.java
View File

@ -4,6 +4,7 @@ import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPCManager;
import net.minecraft.server.EntitySkeleton;
import net.minecraft.server.PathfinderGoalSelector;
import net.minecraft.server.World;
import org.bukkit.entity.Skeleton;
@ -23,6 +24,8 @@ public class CitizensSkeletonNPC extends CitizensMobNPC {
public EntitySkeletonNPC(World world) {
super(world);
goalSelector = new PathfinderGoalSelector();
targetSelector = new PathfinderGoalSelector();
}
@Override

3
src/main/java/net/citizensnpcs/npc/entity/CitizensSlimeNPC.java
View File

@ -4,6 +4,7 @@ import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPCManager;
import net.minecraft.server.EntitySlime;
import net.minecraft.server.PathfinderGoalSelector;
import net.minecraft.server.World;
import org.bukkit.entity.Slime;
@ -24,6 +25,8 @@ public class CitizensSlimeNPC extends CitizensMobNPC {
public EntitySlimeNPC(World world) {
super(world);
setSize(3);
goalSelector = new PathfinderGoalSelector();
targetSelector = new PathfinderGoalSelector();
}
@Override

3
src/main/java/net/citizensnpcs/npc/entity/CitizensSnowmanNPC.java
View File

@ -4,6 +4,7 @@ import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPCManager;
import net.minecraft.server.EntitySnowman;
import net.minecraft.server.PathfinderGoalSelector;
import net.minecraft.server.World;
import org.bukkit.entity.Snowman;
@ -23,6 +24,8 @@ public class CitizensSnowmanNPC extends CitizensMobNPC {
public EntitySnowmanNPC(World world) {
super(world);
goalSelector = new PathfinderGoalSelector();
targetSelector = new PathfinderGoalSelector();
}
@Override

3
src/main/java/net/citizensnpcs/npc/entity/CitizensSpiderNPC.java
View File

@ -4,6 +4,7 @@ import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPCManager;
import net.minecraft.server.EntitySpider;
import net.minecraft.server.PathfinderGoalSelector;
import net.minecraft.server.World;
import org.bukkit.entity.Spider;
@ -23,6 +24,8 @@ public class CitizensSpiderNPC extends CitizensMobNPC {
public EntitySpiderNPC(World world) {
super(world);
goalSelector = new PathfinderGoalSelector();
targetSelector = new PathfinderGoalSelector();
}
@Override

3
src/main/java/net/citizensnpcs/npc/entity/CitizensSquidNPC.java
View File

@ -4,6 +4,7 @@ import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPCManager;
import net.minecraft.server.EntitySquid;
import net.minecraft.server.PathfinderGoalSelector;
import net.minecraft.server.World;
import org.bukkit.entity.Squid;
@ -23,6 +24,8 @@ public class CitizensSquidNPC extends CitizensMobNPC {
public EntitySquidNPC(World world) {
super(world);
goalSelector = new PathfinderGoalSelector();
targetSelector = new PathfinderGoalSelector();
}
@Override

3
src/main/java/net/citizensnpcs/npc/entity/CitizensVillagerNPC.java
View File

@ -4,6 +4,7 @@ import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPCManager;
import net.minecraft.server.EntityVillager;
import net.minecraft.server.PathfinderGoalSelector;
import net.minecraft.server.World;
import org.bukkit.entity.Villager;
@ -23,6 +24,8 @@ public class CitizensVillagerNPC extends CitizensMobNPC {
public EntityVillagerNPC(World world) {
super(world);
goalSelector = new PathfinderGoalSelector();
targetSelector = new PathfinderGoalSelector();
}
@Override

3
src/main/java/net/citizensnpcs/npc/entity/CitizensWolfNPC.java
View File

@ -4,6 +4,7 @@ import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPCManager;
import net.minecraft.server.EntityWolf;
import net.minecraft.server.PathfinderGoalSelector;
import net.minecraft.server.World;
import org.bukkit.entity.Wolf;
@ -23,6 +24,8 @@ public class CitizensWolfNPC extends CitizensMobNPC {
public EntityWolfNPC(World world) {
super(world);
goalSelector = new PathfinderGoalSelector();
targetSelector = new PathfinderGoalSelector();
}
@Override

3
src/main/java/net/citizensnpcs/npc/entity/CitizensZombieNPC.java
View File

@ -4,6 +4,7 @@ import net.citizensnpcs.npc.CitizensMobNPC;
import net.citizensnpcs.npc.CitizensNPCManager;
import net.minecraft.server.EntityZombie;
import net.minecraft.server.PathfinderGoalSelector;
import net.minecraft.server.World;
import org.bukkit.entity.Zombie;
@ -23,6 +24,8 @@ public class CitizensZombieNPC extends CitizensMobNPC {
public EntityZombieNPC(World world) {
super(world);
goalSelector = new PathfinderGoalSelector();
targetSelector = new PathfinderGoalSelector();
}
@Override

3
src/main/java/net/citizensnpcs/trait/LookClose.java
View File

@ -40,6 +40,7 @@ public class LookClose extends Trait implements Runnable {
npc.getHandle().yaw = (float) yaw - 90;
npc.getHandle().pitch = (float) pitch;
npc.getHandle().X = npc.getHandle().yaw;
}
@Override
@ -71,7 +72,7 @@ public class LookClose extends Trait implements Runnable {
public void toggle() {
shouldLookClose = !shouldLookClose;
}
@Override
public String toString() {
return "LookClose{" + shouldLookClose + "}";