diff --git a/pom.xml b/pom.xml
index 3de9dbbe..587b0b4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
 		<dependency>
 			<groupId>com.comphenix.protocol</groupId>
 			<artifactId>ProtocolLib</artifactId>
-			<version>2.4.7</version>
+			<version>2.5.0</version>
 		</dependency>
 	</dependencies>
 	<version>6.8.1</version>
diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/DisguiseSound.java b/src/me/libraryaddict/disguise/DisguiseTypes/DisguiseSound.java
index b242e843..d7cf6f82 100644
--- a/src/me/libraryaddict/disguise/DisguiseTypes/DisguiseSound.java
+++ b/src/me/libraryaddict/disguise/DisguiseTypes/DisguiseSound.java
@@ -20,7 +20,7 @@ public enum DisguiseSound {
 
     COW(Sound.COW_HURT, Sound.COW_WALK, Sound.COW_HURT, Sound.COW_IDLE),
 
-    CREEPER(Sound.CREEPER_HISS, Sound.STEP_GRASS, Sound.CREEPER_DEATH, null),
+    CREEPER(Sound.CREEPER_HISS, Sound.STEP_GRASS, Sound.CREEPER_DEATH),
 
     DONKEY("mob.horse.donkey.hit", Sound.STEP_GRASS, "mob.horse.donkey.death", "mob.horse.donkey.idle"),
 
@@ -33,7 +33,7 @@ public enum DisguiseSound {
     GHAST(Sound.GHAST_SCREAM, null, Sound.GHAST_DEATH, Sound.GHAST_MOAN, Sound.GHAST_CHARGE, Sound.GHAST_FIREBALL,
             Sound.GHAST_SCREAM2, Sound.FALL_BIG, Sound.FALL_SMALL),
 
-    GIANT(Sound.HURT_FLESH, Sound.STEP_GRASS, null, null),
+    GIANT(Sound.HURT_FLESH, Sound.STEP_GRASS),
 
     HORSE("mob.horse.hit", Sound.STEP_GRASS, "mob.horse.death", "mob.horse.idle"),
 
@@ -63,11 +63,11 @@ public enum DisguiseSound {
 
     SLIME(Sound.SLIME_ATTACK, Sound.SLIME_WALK2, null, null, Sound.SLIME_WALK),
 
-    SNOWMAN(null, null, null, null),
+    SNOWMAN(),
 
     SPIDER(Sound.SPIDER_IDLE, Sound.SPIDER_WALK, Sound.SPIDER_DEATH, Sound.SPIDER_IDLE),
 
-    SQUID(null, null, null, null),
+    SQUID(),
 
     UNDEAD_HORSE("mob.horse.zombie.hit", Sound.STEP_GRASS, "mob.horse.zombie.death", "mob.horse.zombie.idle"),
 
diff --git a/src/me/libraryaddict/disguise/Events/DisguisedEvent.java b/src/me/libraryaddict/disguise/Events/DisguisedEvent.java
index 59731421..40a0e753 100644
--- a/src/me/libraryaddict/disguise/Events/DisguisedEvent.java
+++ b/src/me/libraryaddict/disguise/Events/DisguisedEvent.java
@@ -9,9 +9,11 @@ import org.bukkit.event.HandlerList;
 
 public class DisguisedEvent extends Event implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
+
     public static HandlerList getHandlerList() {
         return handlers;
     }
+
     private Disguise disguise;
     private Entity disguised;
 
diff --git a/src/me/libraryaddict/disguise/Events/RedisguisedEvent.java b/src/me/libraryaddict/disguise/Events/RedisguisedEvent.java
index 963bcb04..9ffa89db 100644
--- a/src/me/libraryaddict/disguise/Events/RedisguisedEvent.java
+++ b/src/me/libraryaddict/disguise/Events/RedisguisedEvent.java
@@ -9,9 +9,11 @@ import org.bukkit.event.HandlerList;
 
 public class RedisguisedEvent extends Event implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
+
     public static HandlerList getHandlerList() {
         return handlers;
     }
+
     private Entity disguised;
     private boolean isCancelled;
     private Disguise newDisguise;
diff --git a/src/me/libraryaddict/disguise/Events/UndisguisedEvent.java b/src/me/libraryaddict/disguise/Events/UndisguisedEvent.java
index 6276bccf..8e37834c 100644
--- a/src/me/libraryaddict/disguise/Events/UndisguisedEvent.java
+++ b/src/me/libraryaddict/disguise/Events/UndisguisedEvent.java
@@ -9,9 +9,11 @@ import org.bukkit.event.HandlerList;
 
 public class UndisguisedEvent extends Event implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
+
     public static HandlerList getHandlerList() {
         return handlers;
     }
+
     private Disguise disguise;
     private Entity disguised;