From 7d1dfabc51aa16ba08be2f8fc0c47931af240533 Mon Sep 17 00:00:00 2001
From: TheMode <themode@outlook.fr>
Date: Sat, 24 Apr 2021 10:37:09 +0200
Subject: [PATCH 1/2] Fix color argument

---
 .../command/builder/arguments/minecraft/ArgumentColor.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentColor.java b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentColor.java
index 91fcc6c4e..6e6f804c2 100644
--- a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentColor.java
+++ b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentColor.java
@@ -25,16 +25,15 @@ public class ArgumentColor extends Argument<Style> {
     @NotNull
     @Override
     public Style parse(@NotNull String input) throws ArgumentSyntaxException {
-        String uppercaseInput = input.toUpperCase();
 
         // check for colour
-        NamedTextColor color = NamedTextColor.NAMES.value(uppercaseInput);
+        NamedTextColor color = NamedTextColor.NAMES.value(input);
         if (color != null) {
             return Style.style(color);
         }
 
         // check for reset
-        if (uppercaseInput.equals("RESET")) {
+        if (input.equals("reset")) {
             return Style.empty();
         }
 

From a6314abbadbce8ed91141041d84560e1be1d0ea3 Mon Sep 17 00:00:00 2001
From: TheMode <themode@outlook.fr>
Date: Sat, 24 Apr 2021 12:41:52 +0200
Subject: [PATCH 2/2] Improve physics performance

---
 .../server/collision/CollisionUtils.java      | 33 ++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/main/java/net/minestom/server/collision/CollisionUtils.java b/src/main/java/net/minestom/server/collision/CollisionUtils.java
index fb947341f..7a269741b 100644
--- a/src/main/java/net/minestom/server/collision/CollisionUtils.java
+++ b/src/main/java/net/minestom/server/collision/CollisionUtils.java
@@ -37,20 +37,29 @@ public class CollisionUtils {
         final BoundingBox boundingBox = entity.getBoundingBox();
 
         Vector intermediaryPosition = new Vector();
-        final boolean yCollision = stepAxis(instance, originChunk, currentPosition.toVector(), Y_AXIS, deltaPosition.getY(),
-                intermediaryPosition,
-                deltaPosition.getY() > 0 ? boundingBox.getTopFace() : boundingBox.getBottomFace()
-        );
+        boolean yCollision = false;
+        if (deltaPosition.getY() != 0) {
+            yCollision = stepAxis(instance, originChunk, currentPosition.toVector(), Y_AXIS, deltaPosition.getY(),
+                    intermediaryPosition,
+                    deltaPosition.getY() > 0 ? boundingBox.getTopFace() : boundingBox.getBottomFace()
+            );
+        }
 
-        final boolean xCollision = stepAxis(instance, originChunk, intermediaryPosition, X_AXIS, deltaPosition.getX(),
-                intermediaryPosition,
-                deltaPosition.getX() < 0 ? boundingBox.getLeftFace() : boundingBox.getRightFace()
-        );
+        boolean xCollision = false;
+        if (deltaPosition.getX() != 0) {
+            xCollision = stepAxis(instance, originChunk, intermediaryPosition, X_AXIS, deltaPosition.getX(),
+                    intermediaryPosition,
+                    deltaPosition.getX() < 0 ? boundingBox.getLeftFace() : boundingBox.getRightFace()
+            );
+        }
 
-        final boolean zCollision = stepAxis(instance, originChunk, intermediaryPosition, Z_AXIS, deltaPosition.getZ(),
-                intermediaryPosition,
-                deltaPosition.getZ() > 0 ? boundingBox.getBackFace() : boundingBox.getFrontFace()
-        );
+        boolean zCollision = false;
+        if (deltaPosition.getZ() != 0) {
+            zCollision = stepAxis(instance, originChunk, intermediaryPosition, Z_AXIS, deltaPosition.getZ(),
+                    intermediaryPosition,
+                    deltaPosition.getZ() > 0 ? boundingBox.getBackFace() : boundingBox.getFrontFace()
+            );
+        }
 
         positionOut.setX(intermediaryPosition.getX());
         positionOut.setY(intermediaryPosition.getY());