Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-10-06 03:17:27 +02:00
Code Issues Projects Releases Wiki Activity

Fix ocelot crash

Browse Source
This commit is contained in:
fullwall 2016-06-05 19:07:42 +08:00
parent 01ed1dd0d4
commit fdf5c762c8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,9 +145,10 @@ public class OcelotController extends MobEntityController {
@Override
protected SoundEffect G() {
MinecraftKey a = SoundEffect.a.b(super.G());
return npc == null || !npc.data().has(NPC.AMBIENT_SOUND_METADATA) ? super.G()
: SoundEffect.a.get(new MinecraftKey(
npc.data().get(NPC.AMBIENT_SOUND_METADATA, SoundEffect.a.b(super.G()).toString())));
npc.data().get(NPC.AMBIENT_SOUND_METADATA, a == null ? "" : a.toString())));
}
@Override

1
src/main/java/net/citizensnpcs/npc/skin/Skin.java
View File

@ -206,7 +206,6 @@ public class Skin {
}
private void setData(@Nullable GameProfile profile) {
System.out.println("SET DATA");
if (profile == null) {
isValid = false;
return;