Merge branch 'master' into 1.15
# Conflicts: # src/main/java/carpet/fakes/StructureFeatureInterface.java # src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java
This commit is contained in:
commit
c995716357
41 files changed
+122
-137
No files matched your search
@@ -365,7 +365,7 @@ public class OptimizedExplosion
|
||||
|
||||
private static void getAffectedPositionsOnPlaneX(Explosion e, int x, int yStart, int yEnd, int zStart, int zEnd)
|
||||
{
|
||||
if (rayCalcDone == false)
|
||||
if (!rayCalcDone)
|
||||
{
|
||||
final double xRel = (double) x / 15.0D * 2.0D - 1.0D;
|
||||
|
||||
@@ -388,7 +388,7 @@ public class OptimizedExplosion
|
||||
|
||||
private static void getAffectedPositionsOnPlaneY(Explosion e, int y, int xStart, int xEnd, int zStart, int zEnd)
|
||||
{
|
||||
if (rayCalcDone == false)
|
||||
if (!rayCalcDone)
|
||||
{
|
||||
final double yRel = (double) y / 15.0D * 2.0D - 1.0D;
|
||||
|
||||
@@ -411,7 +411,7 @@ public class OptimizedExplosion
|
||||
|
||||
private static void getAffectedPositionsOnPlaneZ(Explosion e, int z, int xStart, int xEnd, int yStart, int yEnd)
|
||||
{
|
||||
if (rayCalcDone == false)
|
||||
if (!rayCalcDone)
|
||||
{
|
||||
final double zRel = (double) z / 15.0D * 2.0D - 1.0D;
|
||||
|
||||
|
||||
Reference in new issue
Block a user