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

formatting fun

Browse Source
This commit is contained in:
aPunch 2012-01-22 01:52:46 -06:00
parent c221abc75d
commit f1bc5dba8f
6 changed files with 21 additions and 30 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.

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

@ -32,7 +32,7 @@ public class CitizensNPC implements NPC {
this.name = name;
this.character = character;
manager = (CitizensNPCManager) CitizensAPI.getNPCManager();
id = manager.getUniqueID();
id = manager.generateUniqueId();
}
public CitizensNPC(int id, String name, Character character) {
@ -59,11 +59,10 @@ public class CitizensNPC implements NPC {
@Override
public void addTrait(Trait trait) {
if (!hasTrait(trait.getClass())) {
if (!hasTrait(trait.getClass()))
traits.put(trait.getClass(), trait);
} else {
else
Messaging.debug("The NPC already has the trait '" + getTrait(trait.getClass()).getName() + "'.");
}
}
@Override
@ -134,11 +133,10 @@ public class CitizensNPC implements NPC {
return;
}
if (mcEntity == null) {
if (mcEntity == null)
mcEntity = manager.spawn(this, loc);
} else {
else
manager.spawn(this, loc);
}
// Set the location
addTrait(new SpawnLocation(loc));
@ -162,9 +160,8 @@ public class CitizensNPC implements NPC {
@Override
public void remove() {
if (isSpawned()) {
if (isSpawned())
despawn();
}
manager.remove(this);
}

9
src/net/citizensnpcs/npc/CitizensNPCManager.java
View File

@ -77,7 +77,7 @@ public class CitizensNPCManager implements NPCManager {
return spawned.contains(entity.getEntityId());
}
public int getUniqueID() {
public int generateUniqueId() {
int count = 0;
while (true) {
if (getNPC(count) == null)
@ -89,7 +89,7 @@ public class CitizensNPCManager implements NPCManager {
public CraftNPC spawn(NPC npc, Location loc) {
if (spawned.contains(npc.getBukkitEntity().getEntityId()))
throw new IllegalStateException("already spawned");
throw new IllegalStateException("The NPC with ID '" + npc.getId() + "' is already spawned.");
WorldServer ws = getWorldServer(loc.getWorld());
CraftNPC mcEntity = new CraftNPC(getMinecraftServer(ws.getServer()), ws, npc.getFullName(),
new ItemInWorldManager(ws));
@ -104,11 +104,10 @@ public class CitizensNPCManager implements NPCManager {
public void despawn(NPC npc) {
if (!spawned.contains(npc.getBukkitEntity().getEntityId()))
throw new IllegalStateException("already despawned");
throw new IllegalStateException("The NPC with ID '" + npc.getId() + "' is already despawned.");
CraftNPC mcEntity = ((CitizensNPC) npc).getHandle();
for (Player player : Bukkit.getOnlinePlayers()) {
for (Player player : Bukkit.getOnlinePlayers())
((CraftPlayer) player).getHandle().netServerHandler.sendPacket(new Packet29DestroyEntity(mcEntity.id));
}
Location loc = npc.getBukkitEntity().getLocation();
getWorldServer(loc.getWorld()).removeEntity(mcEntity);
npc.getTrait(SpawnLocation.class).setLocation(loc);

5
src/net/citizensnpcs/npc/trait/CitizensTraitManager.java
View File

@ -13,9 +13,8 @@ public class CitizensTraitManager implements TraitManager {
@Override
public Trait getTrait(String name) {
if (registered.get(name) == null) {
if (registered.get(name) == null)
return null;
}
return registered.get(name).create();
}
@ -27,7 +26,7 @@ public class CitizensTraitManager implements TraitManager {
@Override
public void registerTraitWithFactory(String name, Factory<? extends Trait> factory) {
if (registered.get(name) != null)
throw new IllegalArgumentException("trait factory already registered");
throw new IllegalArgumentException("Trait factory already registered.");
registered.put(name, factory);
}

18
src/net/citizensnpcs/util/ByIdArray.java
View File

@ -49,17 +49,13 @@ public class ByIdArray<T> implements Iterable<T> {
return (T) elementData[index];
}
/*@SuppressWarnings("unchecked")
public T[] toArray(T[] a) {
if (a.length < size)
// Make a new array of a's runtime type, but my contents:
return (T[]) Arrays.copyOf(elementData, size, a.getClass());
System.arraycopy(elementData, 0, a, 0, size);
if (a.length > size)
a[size] = null;
return a;
}
*/
/*
* @SuppressWarnings("unchecked") public T[] toArray(T[] a) { if (a.length <
* size) // Make a new array of a's runtime type, but my contents: return
* (T[]) Arrays.copyOf(elementData, size, a.getClass());
* System.arraycopy(elementData, 0, a, 0, size); if (a.length > size)
* a[size] = null; return a; }
*/
@Override
public Iterator<T> iterator() {