Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-09-29 23:17:59 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into acquirable

Browse Source
This commit is contained in:
TheMode 2021-04-24 14:36:57 +02:00
commit 83271a00eb
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/net/minestom/server/collision/CollisionUtils.java
View File

@ -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());

5
src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentColor.java
View File

@ -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();
}