From f0d96b7c50cb1aceb101c5e9c0d78806b87e1240 Mon Sep 17 00:00:00 2001 From: Lex Manos Date: Fri, 6 Feb 2015 21:35:27 -0800 Subject: [PATCH] Fixed being kicked from the server while swimming. --- .../minecraft/network/NetHandlerPlayServer.java.patch | 9 --------- patches/minecraft/net/minecraft/world/World.java.patch | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/patches/minecraft/net/minecraft/network/NetHandlerPlayServer.java.patch b/patches/minecraft/net/minecraft/network/NetHandlerPlayServer.java.patch index db3ff539a..08c6283c1 100644 --- a/patches/minecraft/net/minecraft/network/NetHandlerPlayServer.java.patch +++ b/patches/minecraft/net/minecraft/network/NetHandlerPlayServer.java.patch @@ -65,15 +65,6 @@ { this.func_147364_a(this.field_147373_o, this.field_147382_p, this.field_147381_q, f1, f2); return; -@@ -381,7 +396,7 @@ - - AxisAlignedBB axisalignedbb = this.field_147369_b.func_174813_aQ().func_72314_b((double)f3, (double)f3, (double)f3).func_72321_a(0.0D, -0.55D, 0.0D); - -- if (!this.field_147367_d.func_71231_X() && !this.field_147369_b.field_71075_bZ.field_75101_c && !worldserver.func_72829_c(axisalignedbb)) -+ if (!this.field_147367_d.func_71231_X() && !this.field_147369_b.field_71075_bZ.field_75101_c && !worldserver.func_72829_c(axisalignedbb) && !this.field_147369_b.field_71075_bZ.field_75101_c) - { - if (d18 >= -0.03125D) - { @@ -400,6 +415,8 @@ this.field_147365_f = 0; } diff --git a/patches/minecraft/net/minecraft/world/World.java.patch b/patches/minecraft/net/minecraft/world/World.java.patch index 2cba2d7bc..1da6baff6 100644 --- a/patches/minecraft/net/minecraft/world/World.java.patch +++ b/patches/minecraft/net/minecraft/world/World.java.patch @@ -422,7 +422,7 @@ Block block = this.func_180495_p(new BlockPos(k1, l1, i2)).func_177230_c(); - if (block.func_149688_o() != Material.field_151579_a) -+ if (block.isAir(this, new BlockPos(k1, l1, i2))) ++ if (!block.isAir(this, new BlockPos(k1, l1, i2))) { return true; }