From a1cb565275d8821d327ae30469f52baf5183e03f Mon Sep 17 00:00:00 2001
From: Matthew Messinger <mattmess1221@gmail.com>
Date: Mon, 13 Feb 2017 23:26:21 -0500
Subject: [PATCH] Add travis config Also another itemstack == null

---
 .gitmodules                                                 | 3 ---
 .travis.yml                                                 | 3 +++
 build.gradle                                                | 6 +-----
 build.number                                                | 4 ++--
 buildSrc                                                    | 1 -
 .../com/minelittlepony/renderer/layer/LayerPonyArmor.java   | 2 +-
 6 files changed, 7 insertions(+), 12 deletions(-)
 delete mode 100644 .gitmodules
 create mode 100644 .travis.yml
 delete mode 160000 buildSrc

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index b35c52a0..00000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "ForgeGradle-LiteLoader"]
-	path = buildSrc
-	url = https://github.com/killjoy1221/ForgeGradle-LiteLoader
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..968917cb
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,3 @@
+language: java
+jdk:
+    - oraclejdk8
diff --git a/build.gradle b/build.gradle
index 1b56230b..454cb2c4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,10 +5,6 @@ buildscript {
 			name 'forge'
 			url 'http://files.minecraftforge.net/maven'
 		}
-		maven {
-			name 'm2'
-			url 'https://plugins.gradle.org/m2'
-		}
 		maven {
 			name = 'sponge'
 			url = 'http://repo.spongepowered.org/maven'
@@ -24,7 +20,7 @@ apply plugin: 'net.minecraftforge.gradle.liteloader'
 apply plugin: 'org.spongepowered.mixin'
 
 group = 'com.minelittlepony'
-version = '1.11.2.1'
+version = '1.11.2.2-SNAPSHOT'
 description = 'Mine Little Pony'
 
 targetCompatibility = 1.8
diff --git a/build.number b/build.number
index 4c8474e3..79f4b84e 100644
--- a/build.number
+++ b/build.number
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Fri Jan 06 18:22:59 EST 2017
-build.number=301
+#Wed Feb 01 15:58:53 EST 2017
+build.number=310
diff --git a/buildSrc b/buildSrc
deleted file mode 160000
index 7f6a9b2e..00000000
--- a/buildSrc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7f6a9b2e44fc9496be253f1595b8585958e04c01
diff --git a/src/main/java/com/minelittlepony/renderer/layer/LayerPonyArmor.java b/src/main/java/com/minelittlepony/renderer/layer/LayerPonyArmor.java
index a3e51bbf..8aa35671 100644
--- a/src/main/java/com/minelittlepony/renderer/layer/LayerPonyArmor.java
+++ b/src/main/java/com/minelittlepony/renderer/layer/LayerPonyArmor.java
@@ -61,7 +61,7 @@ public class LayerPonyArmor implements LayerRenderer<EntityLivingBase> {
                              EntityEquipmentSlot armorSlot) {
         ItemStack itemstack = entity.getItemStackFromSlot(armorSlot);
 
-        if (itemstack != null && itemstack.getItem() instanceof ItemArmor) {
+        if (!itemstack.isEmpty() && itemstack.getItem() instanceof ItemArmor) {
 
             ItemArmor itemarmor = (ItemArmor) itemstack.getItem();
             boolean isLegs = armorSlot == EntityEquipmentSlot.LEGS;