Merge pull request #316 from buildist/master

Don't use ice physics when noclipping, fix +ophax
andrewphorn · May 20, 2015 · 7f4d7ca · 7f4d7ca
2 parents 8111552 + 3d449df
commit 7f4d7ca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/com/mojang/minecraft/mob/Mob.java b/src/main/java/com/mojang/minecraft/mob/Mob.java
@@ -505,7 +505,7 @@ public void travel(float yya, float xxa) {
             yd *= 0.98F;
             zd *= 0.91F;
             yd = (float) (yd - 0.08D);
-            if (Block.blocks[var1] != Block.ICE) {
+            if (Block.blocks[var1] != Block.ICE || noPhysics) {
 
                 if (flyingMode) {
                     y1 = 0F;

diff --git a/src/main/java/com/mojang/minecraft/net/PacketHandler.java b/src/main/java/com/mojang/minecraft/net/PacketHandler.java
@@ -111,11 +111,11 @@ private void handleStandardPacket(NetworkManager networkManager, PacketType pack
             // Read WoM-style hack control flags
             //TODO: if(!isExtEnabled(ProtocolExtension.HACK_CONTROL)){ ... }
             minecraft.womConfig.readHax(name, motd);
+            minecraft.player.userType = (Byte) packetParams[3];
             if (!receivedExtInfo) {
                 // Only process WoM-style "cfg" command if CPE is not enabled
                 minecraft.womConfig.readCfg(motd);
             }
-            minecraft.player.userType = (Byte) packetParams[3];
             setLoadingLevel(true);
             if (minecraft.womConfig.isEnabled() && minecraft.womConfig.hasKey("server.sendwomid")) {
                 String womIdCmd = "/womid ClassiCube" + Constants.CLASSICUBE_VERSION;