CatMC-Network/PaperSpigot-Parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix movement inconsistencies

Browse Source
This commit is contained in:
Iceee 2014-06-22 15:47:53 -05:00 committed by Zach Brown
parent 95151481dc
commit aedab4b551
1 changed files with 127 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
CraftBukkit-Patches/0163-Fix-movement-inconsistencies.patch Normal file
View File

@ -0,0 +1,127 @@
From aa51482ccd261d9a7044055016f91a17bdaa5041 Mon Sep 17 00:00:00 2001
From: Iceee <andrew@opticgaming.tv>
Date: Thu, 12 Jun 2014 03:18:13 -0500
Subject: [PATCH] Fix movement inconsistencies
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 57861a9..2b78287 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -525,41 +525,85 @@ public abstract class Entity {
List list = this.world.getCubes(this, this.boundingBox.a(d0, d1, d2));
- for (int i = 0; i < list.size(); ++i) {
- d1 = ((AxisAlignedBB) list.get(i)).b(this.boundingBox, d1);
- }
+ // PaperSpigot start - Fix movement inconsistencies
+ boolean flag1;
- this.boundingBox.d(0.0D, d1, 0.0D);
- if (!this.J && d7 != d1) {
- d2 = 0.0D;
- d1 = 0.0D;
- d0 = 0.0D;
- }
+ if(this.motZ > this.motX) {
- boolean flag1 = this.onGround || d7 != d1 && d7 < 0.0D;
+ for (int i = 0; i < list.size(); ++i) {
+ d1 = ((AxisAlignedBB) list.get(i)).b(this.boundingBox, d1);
+ }
- int j;
+ this.boundingBox.d(0.0D, d1, 0.0D);
+ if (!this.J && d7 != d1) {
+ d2 = 0.0D;
+ d1 = 0.0D;
+ d0 = 0.0D;
+ }
- for (j = 0; j < list.size(); ++j) {
- d0 = ((AxisAlignedBB) list.get(j)).a(this.boundingBox, d0);
- }
+ flag1 = this.onGround || d7 != d1 && d7 < 0.0D;
- this.boundingBox.d(d0, 0.0D, 0.0D);
- if (!this.J && d6 != d0) {
- d2 = 0.0D;
- d1 = 0.0D;
- d0 = 0.0D;
- }
+ int j;
- for (j = 0; j < list.size(); ++j) {
- d2 = ((AxisAlignedBB) list.get(j)).c(this.boundingBox, d2);
- }
+ for (j = 0; j < list.size(); ++j) {
+ d0 = ((AxisAlignedBB) list.get(j)).a(this.boundingBox, d0);
+ }
- this.boundingBox.d(0.0D, 0.0D, d2);
- if (!this.J && d8 != d2) {
- d2 = 0.0D;
- d1 = 0.0D;
- d0 = 0.0D;
+ this.boundingBox.d(d0, 0.0D, 0.0D);
+ if (!this.J && d6 != d0) {
+ d2 = 0.0D;
+ d1 = 0.0D;
+ d0 = 0.0D;
+ }
+
+ for (j = 0; j < list.size(); ++j) {
+ d2 = ((AxisAlignedBB) list.get(j)).c(this.boundingBox, d2);
+ }
+
+ this.boundingBox.d(0.0D, 0.0D, d2);
+ if (!this.J && d8 != d2) {
+ d2 = 0.0D;
+ d1 = 0.0D;
+ d0 = 0.0D;
+ }
+ } else {
+ for (int i = 0; i < list.size(); ++i) {
+ d1 = ((AxisAlignedBB) list.get(i)).b(this.boundingBox, d1);
+ }
+
+ this.boundingBox.d(0.0D, d1, 0.0D);
+ if (!this.J && d7 != d1) {
+ d2 = 0.0D;
+ d1 = 0.0D;
+ d0 = 0.0D;
+ }
+
+ flag1 = this.onGround || d7 != d1 && d7 < 0.0D;
+
+ int j;
+
+ for (j = 0; j < list.size(); ++j) {
+ d2 = ((AxisAlignedBB) list.get(j)).c(this.boundingBox, d2);
+ }
+
+ this.boundingBox.d(0.0D, 0.0D, d2);
+ if (!this.J && d8 != d2) {
+ d2 = 0.0D;
+ d1 = 0.0D;
+ d0 = 0.0D;
+ }
+
+ for (j = 0; j < list.size(); ++j) {
+ d0 = ((AxisAlignedBB) list.get(j)).a(this.boundingBox, d0);
+ }
+
+ this.boundingBox.d(d0, 0.0D, 0.0D);
+ if (!this.J && d6 != d0) {
+ d2 = 0.0D;
+ d1 = 0.0D;
+ d0 = 0.0D;
+ }
+ // PaperSpigot end
}
double d10;
--
1.9.1