diff --git a/src/main/java/org/spacehq/mc/protocol/data/MagicValues.java b/src/main/java/org/spacehq/mc/protocol/data/MagicValues.java
index 648d5725..188bc1c8 100644
--- a/src/main/java/org/spacehq/mc/protocol/data/MagicValues.java
+++ b/src/main/java/org/spacehq/mc/protocol/data/MagicValues.java
@@ -543,6 +543,7 @@ public class MagicValues {
         register(Achievement.KILL_WITHER, "achievement.killWither");
         register(Achievement.MAKE_FULL_BEACON, "achievement.fullBeacon");
         register(Achievement.EXPLORE_ALL_BIOMES, "achievement.exploreAllBiomes");
+        register(Achievement.OVERPOWERED, "achievement.overpowered");
 
         register(GenericStatistic.TIMES_LEFT_GAME, "stat.leaveGame");
         register(GenericStatistic.MINUTES_PLAYED, "stat.playOneMinute");
diff --git a/src/main/java/org/spacehq/mc/protocol/data/game/statistic/Achievement.java b/src/main/java/org/spacehq/mc/protocol/data/game/statistic/Achievement.java
index 866ed619..caa089b9 100644
--- a/src/main/java/org/spacehq/mc/protocol/data/game/statistic/Achievement.java
+++ b/src/main/java/org/spacehq/mc/protocol/data/game/statistic/Achievement.java
@@ -33,6 +33,7 @@ public enum Achievement implements Statistic {
     SPAWN_WITHER,
     KILL_WITHER,
     MAKE_FULL_BEACON,
-    EXPLORE_ALL_BIOMES;
+    EXPLORE_ALL_BIOMES,
+    OVERPOWERED;
 
 }
diff --git a/src/main/java/org/spacehq/mc/protocol/packet/ingame/server/world/ServerPlayEffectPacket.java b/src/main/java/org/spacehq/mc/protocol/packet/ingame/server/world/ServerPlayEffectPacket.java
index 3ee91fbb..ebb64e76 100644
--- a/src/main/java/org/spacehq/mc/protocol/packet/ingame/server/world/ServerPlayEffectPacket.java
+++ b/src/main/java/org/spacehq/mc/protocol/packet/ingame/server/world/ServerPlayEffectPacket.java
@@ -59,13 +59,7 @@ public class ServerPlayEffectPacket implements Packet {
 
     @Override
     public void read(NetInput in) throws IOException {
-        int id = in.readInt();
-        if(id >= 2000) {
-            this.effect = MagicValues.key(ParticleEffect.class, id);
-        } else {
-            this.effect = MagicValues.key(SoundEffect.class, id);
-        }
-
+        this.effect = MagicValues.key(WorldEffect.class, in.readInt());
         this.position = NetUtil.readPosition(in);
         int value = in.readInt();
         if(this.effect == SoundEffect.RECORD) {