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

Merge branch 'master' of https://github.com/CitizensDev/Citizens2

Browse Source
This commit is contained in:
fullwall 2014-03-04 19:47:22 +08:00
commit 63023cc54f
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/citizensnpcs/commands/NPCCommands.java
View File

@ -1075,7 +1075,7 @@ public class NPCCommands {
} }
Location prev = npc.isSpawned() ? npc.getEntity().getLocation() : null; Location prev = npc.isSpawned() ? npc.getEntity().getLocation() : null;
npc.despawn(DespawnReason.PENDING_RESPAWN); npc.despawn(DespawnReason.PENDING_RESPAWN);
npc.setName(newName); npc.setName(Colorizer.parseColors(newName));
if (prev != null) if (prev != null)
npc.spawn(prev); npc.spawn(prev);

4
src/main/java/net/citizensnpcs/trait/Controllable.java
View File

@ -354,6 +354,10 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab
} }
} }
public static void registerControllerType(EntityType type, Class<? extends MovementController> clazz) {
controllerTypes.put(type, clazz);
}
private static final Map<EntityType, Class<? extends MovementController>> controllerTypes = Maps private static final Map<EntityType, Class<? extends MovementController>> controllerTypes = Maps
.newEnumMap(EntityType.class); .newEnumMap(EntityType.class);