From 050ca0bde9b967e7cf0bbc14d0c2745864e54f15 Mon Sep 17 00:00:00 2001 From: ShetiPhian Date: Sun, 26 Aug 2012 06:14:51 -0300 Subject: [PATCH] Update patches/common/net/minecraft/src/NetServerHandler.java.patch Update patches/common/net/minecraft/src/NetServerHandler.java.patch Server mods can now use noClip to push players through solid blocks without is being an invalid move and resetting the players position. Useful for creating semi-solid blocks like quicksand. --- .../common/net/minecraft/src/NetServerHandler.java.patch | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/patches/common/net/minecraft/src/NetServerHandler.java.patch b/patches/common/net/minecraft/src/NetServerHandler.java.patch index 15e242e2e..603969a47 100644 --- a/patches/common/net/minecraft/src/NetServerHandler.java.patch +++ b/patches/common/net/minecraft/src/NetServerHandler.java.patch @@ -1,5 +1,14 @@ --- ../src_base/common/net/minecraft/src/NetServerHandler.java +++ ../src_work/common/net/minecraft/src/NetServerHandler.java +@@ -306,7 +306,7 @@ + this.playerEntity.setPositionAndRotation(var5, var7, var9, var11, var12); + boolean var32 = var2.getCollidingBoundingBoxes(this.playerEntity, this.playerEntity.boundingBox.copy().contract((double)var27, (double)var27, (double)var27)).isEmpty(); + +- if (var28 && (var31 || !var32) && !this.playerEntity.isPlayerSleeping()) ++ if (var28 && (var31 || !var32) && !this.playerEntity.isPlayerSleeping() && !this.playerEntity.noClip) + { + this.setPlayerLocation(this.lastPosX, this.lastPosY, this.lastPosZ, var11, var12); + return; @@ -388,7 +388,10 @@ double var12 = this.playerEntity.posZ - ((double)var7 + 0.5D); double var14 = var8 * var8 + var10 * var10 + var12 * var12;