fixed issue #67

mung3r · Apr 19, 2014 · 6546652 · 6546652
1 parent 8f0260e
commit 6546652
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/main/java/com/edwardhand/mobrider/ConfigManager.java b/src/main/java/com/edwardhand/mobrider/ConfigManager.java
@@ -104,8 +104,11 @@ public ConfigManager(MobRider plugin)
         ConfigurationSection mobs = config.getConfigurationSection("mobs");
         for (String name : mobs.getKeys(false)) {
             ConfigurationSection mob = mobs.getConfigurationSection(name);
-            new RideType(EntityType.fromName(name), Double.valueOf(mob.getDouble("speed")).floatValue(), mob.getString("noise"), mob.getDouble("chance"),
-                    mob.getDouble("cost"));
+            EntityType type = EntityType.fromName(name);
+            if (type != null) {
+                new RideType(type, Double.valueOf(mob.getDouble("speed")).floatValue(), mob.getString("noise"), mob.getDouble("chance"),
+                        mob.getDouble("cost"));
+            }
         }
     }
 

diff --git a/src/main/java/com/edwardhand/mobrider/commons/MessageUtils.java b/src/main/java/com/edwardhand/mobrider/commons/MessageUtils.java
@@ -41,7 +41,7 @@ public static void sendMessage(Rider rider, String suffix)
         Player player = rider.getPlayer();
         LivingEntity ride = rider.getRide();
 
-        if (player != null && ride != null && !(ride instanceof HumanEntity)) {
+        if (player != null && ride != null && rider.getRideType() != null && !(ride instanceof HumanEntity)) {
             player.sendMessage("<" + getHealthString(rider) + "§e" + ride.getType().getName() + "§f> " + rider.getRideType().getNoise() + suffix);
         }
     }