diff --git a/src/main/java/org/spout/vanilla/protocol/event/SpawnPlayerEvent.java b/src/main/java/org/spout/vanilla/protocol/event/SpawnPlayerEvent.java
diff --git a/src/main/java/org/spout/vanilla/protocol/event/TimeUpdateProtocolEvent.java b/src/main/java/org/spout/vanilla/protocol/event/TimeUpdateProtocolEvent.java
diff --git a/src/main/java/org/spout/vanilla/protocol/event/WeatherChangeProtocolEvent.java b/src/main/java/org/spout/vanilla/protocol/event/WeatherChangeProtocolEvent.java
diff --git a/...illa/protocol/event/StateChangeEvent.java → ...col/event/entity/EntityMetadataEvent.java b/...illa/protocol/event/StateChangeEvent.java → ...col/event/entity/EntityMetadataEvent.java
@@ -23,27 +23,31 @@
  * License and see <http://www.spout.org/SpoutDevLicenseV1.txt> for the full license,
  * including the MIT license.
  */
-package org.spout.vanilla.protocol.event;
+package org.spout.vanilla.protocol.event.entity;
 
 import org.spout.api.protocol.event.ProtocolEvent;
+import org.spout.api.util.Parameter;
 
-public class StateChangeEvent extends ProtocolEvent {
-	private final byte reasonCode, gameMode;
+import java.util.List;
+
+public class EntityMetadataEvent extends ProtocolEvent {
+	private final int entityId;
+	private List<Parameter<?>> parameters;
 
-	public StateChangeEvent(byte reasonCode, byte gameMode) {
-		this.reasonCode = reasonCode;
-		this.gameMode = gameMode;
+	public EntityMetadataEvent(int entityId, List<Parameter<?>> parameters) {
+		this.entityId = entityId;
+		this.parameters = parameters;
 	}
-
-	public StateChangeEvent(byte reasonCode) {
-		this(reasonCode, (byte) -1);
+	
+	public int getEntityId() {
+		return entityId;
 	}
 
-	public byte getReasonCode() {
-		return reasonCode;
+	public List<Parameter<?>> getParameters() {
+		return parameters;
 	}
 
-	public byte getGameMode() {
-		return gameMode;
+	public void setParameters(List<Parameter<?>> parameters) {
+		this.parameters = parameters;
 	}
 }
diff --git a/src/main/java/org/spout/vanilla/protocol/event/entity/player/PlayerHealthEvent.java b/src/main/java/org/spout/vanilla/protocol/event/entity/player/PlayerHealthEvent.java
@@ -58,7 +58,7 @@ public float getFoodSaturation() {
 		return saturation;
 	}
 
-	public void setFoodSaturation(float saturation) {
+	public void setFoodSaturation(short saturation) {
 		this.saturation = saturation;
 	}
 }
diff --git a/src/main/java/org/spout/vanilla/protocol/msg/UserListItemMessage.java b/src/main/java/org/spout/vanilla/protocol/msg/UserListItemMessage.java