Added second fly check and replace first one and improved collision c…

…heck accuracy
funkemunky · Dec 28, 2018 · d829f9d · d829f9d
1 parent 7be18e1
commit d829f9d
Show file tree

Hide file tree

Showing 6 changed files with 85 additions and 86 deletions.
diff --git a/Daedalus/.idea/workspace.xml b/Daedalus/.idea/workspace.xml
diff --git a/Daedalus/out/artifacts/Daedalus_jar/Daedalus.jar b/Daedalus/out/artifacts/Daedalus_jar/Daedalus.jar
diff --git a/Daedalus/out/production/Daedalus/cc/funkemunky/daedalus/api/utils/CollisionAssessment.class b/Daedalus/out/production/Daedalus/cc/funkemunky/daedalus/api/utils/CollisionAssessment.class
diff --git a/Daedalus/out/production/Daedalus/cc/funkemunky/daedalus/impl/checks/movement/Fly.class b/Daedalus/out/production/Daedalus/cc/funkemunky/daedalus/impl/checks/movement/Fly.class
diff --git a/Daedalus/src/cc/funkemunky/daedalus/api/utils/CollisionAssessment.java b/Daedalus/src/cc/funkemunky/daedalus/api/utils/CollisionAssessment.java
@@ -36,7 +36,7 @@ public void assessBox(BoundingBox bb, World world) {
 
         if (BlockUtils.isSolid(block)) {
             if (bb.getMinimum().getY() < (playerBox.getMinimum().getY() + 0.1)) {
-                if(bb.collidesVertically(playerBox.subtract(0, 0.1f,0,0,0,0))) {
+                if(bb.collidesVertically(playerBox.subtract(0, 0.001f,0,0,0,0))) {
                     onGround = true;
                     fullyInAir = false;
 
@@ -48,7 +48,7 @@ public void assessBox(BoundingBox bb, World world) {
                 }
             }
 
-            if ((bb.getMaximum().getY() + 0.1) > playerBox.getMaximum().getY() && bb.collidesVertically(playerBox.add(0, 0, 0, 0, 0.35f, 0))) {
+            if ((bb.getMaximum().getY() + 0.1) > playerBox.getMaximum().getY() && bb.collidesVertically(playerBox.add(0, 0, 0, 0, 0.5f, 0))) {
                 blocksOnTop = true;
             }