From 742edf0138ab8f721bcc0c79138c3bf2db8140ef Mon Sep 17 00:00:00 2001
From: bconlon <bconlon@gildedgames.com>
Date: Tue, 14 Jul 2020 23:30:03 -0700
Subject: [PATCH] Mos.

---
 .../com/legacy/aether/AetherEventHandler.java | 41 ++++++++++---------
 .../client/renders/entity/MoaRenderer.java    | 11 ++++-
 2 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/legacy/aether/AetherEventHandler.java b/src/main/java/com/legacy/aether/AetherEventHandler.java
index 0537e33..7b4302e 100644
--- a/src/main/java/com/legacy/aether/AetherEventHandler.java
+++ b/src/main/java/com/legacy/aether/AetherEventHandler.java
@@ -271,33 +271,36 @@ AetherEventHandler {
 	@SubscribeEvent
 	public void onEntityAttack(AttackEntityEvent event)
 	{
-		if (event.entityPlayer.getHeldItem().getItem() == ItemsAether.flaming_sword)
+		if (event.entityPlayer.getHeldItem() != null)
 		{
-			if (event.target.canAttackWithItem())
+			if (event.entityPlayer.getHeldItem().getItem() == ItemsAether.flaming_sword)
 			{
-				if (!event.target.hitByEntity(event.entityPlayer))
+				if (event.target.canAttackWithItem())
 				{
-					if (event.target instanceof EntityLivingBase)
+					if (!event.target.hitByEntity(event.entityPlayer))
 					{
-						event.target.setFire(30);
+						if (event.target instanceof EntityLivingBase)
+						{
+							event.target.setFire(30);
+						}
 					}
 				}
 			}
-		}
-		else if (event.entityPlayer.getHeldItem().getItem() == ItemsAether.pig_slayer)
-		{
-			String s = EntityList.getEntityString((Entity) event.target);
+			else if (event.entityPlayer.getHeldItem().getItem() == ItemsAether.pig_slayer)
+			{
+				String s = EntityList.getEntityString((Entity) event.target);
 
-			if (s != null && (s.toLowerCase().contains("pig") || s.toLowerCase().contains("phyg") || s.toLowerCase().contains("taegore") || event.target.getUniqueID().toString().equals("1d680bb6-2a9a-4f25-bf2f-a1af74361d69"))) {
-				if (event.target.worldObj.isRemote)
-				{
-					for (int j = 0; j < 20; j++) {
-						Random itemRand = new Random();
-						double d = itemRand.nextGaussian() * 0.02D;
-						double d1 = itemRand.nextGaussian() * 0.02D;
-						double d2 = itemRand.nextGaussian() * 0.02D;
-						double d3 = 5D;
-						event.target.worldObj.spawnParticle("flame", (event.target.posX + (double) (itemRand.nextFloat() * event.target.width * 2.0F)) - (double) event.target.width - d * d3, (event.target.posY + (double) (itemRand.nextFloat() * event.target.height)) - d1 * d3, (event.target.posZ + (double) (itemRand.nextFloat() * event.target.width * 2.0F)) - (double) event.target.width - d2 * d3, d, d1, d2);
+				if (s != null && (s.toLowerCase().contains("pig") || s.toLowerCase().contains("phyg") || s.toLowerCase().contains("taegore") || event.target.getUniqueID().toString().equals("1d680bb6-2a9a-4f25-bf2f-a1af74361d69"))) {
+					if (event.target.worldObj.isRemote)
+					{
+						for (int j = 0; j < 20; j++) {
+							Random itemRand = new Random();
+							double d = itemRand.nextGaussian() * 0.02D;
+							double d1 = itemRand.nextGaussian() * 0.02D;
+							double d2 = itemRand.nextGaussian() * 0.02D;
+							double d3 = 5D;
+							event.target.worldObj.spawnParticle("flame", (event.target.posX + (double) (itemRand.nextFloat() * event.target.width * 2.0F)) - (double) event.target.width - d * d3, (event.target.posY + (double) (itemRand.nextFloat() * event.target.height)) - d1 * d3, (event.target.posZ + (double) (itemRand.nextFloat() * event.target.width * 2.0F)) - (double) event.target.width - d2 * d3, d, d1, d2);
+						}
 					}
 				}
 			}
diff --git a/src/main/java/com/legacy/aether/client/renders/entity/MoaRenderer.java b/src/main/java/com/legacy/aether/client/renders/entity/MoaRenderer.java
index 16e9ba3..042a53f 100644
--- a/src/main/java/com/legacy/aether/client/renders/entity/MoaRenderer.java
+++ b/src/main/java/com/legacy/aether/client/renders/entity/MoaRenderer.java
@@ -36,6 +36,8 @@ public class MoaRenderer extends RenderLiving {
 
 	private static final ResourceLocation BLACK_SADDLE = Aether.locate("textures/entities/moa/black_moa_saddle.png");
 
+	private static final ResourceLocation MOS = new ResourceLocation("aether_legacy", "textures/entities/moa/mos.png");
+
 	public MoaRenderer() {
 		super(new MoaModel(0.0F), 1.0F);
 
@@ -152,7 +154,14 @@ public class MoaRenderer extends RenderLiving {
 			}
 		}
 
-		return moa.getMoaType().getTexture(moa.isSaddled(), moa.riddenByEntity != null);
+		if (moa.hasCustomNameTag() && "Mos".equals(moa.getCustomNameTag()) && (moa.getMoaType() == AetherMoaTypes.orange))
+		{
+			return MOS;
+		}
+		else
+		{
+			return moa.getMoaType().getTexture(moa.isSaddled(), moa.riddenByEntity != null);
+		}
 	}
 
 	private static float r(int r) {