Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-22 17:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use Math.floor instead of int cast 757bef1f7d2b16317ab3d18427ad22183344e28d

Browse Source
This commit is contained in:
JOO200 2021-12-29 05:58:56 +01:00 committed by dordsor21
parent c28a5ee66e
commit 5d4a2a4a0d
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
worldedit-core/src/main/java/com/sk89q/worldedit/math/convolution/HeightMapFilter.java
View File

@ -105,7 +105,7 @@ public class HeightMapFilter {
for (int y = 0; y < height; ++y) { for (int y = 0; y < height; ++y) {
for (int x = 0; x < width; ++x) { for (int x = 0; x < width; ++x) {
outData[index++] = (int) calculateHeight(inDataFloat, width, height, offset, matrix, x, y); outData[index++] = (int) Math.floor(calculateHeight(inDataFloat, width, height, offset, matrix, x, y));
} }
} }
return outData; return outData;

17
worldedit-core/src/main/java/com/sk89q/worldedit/math/convolution/SnowHeightMap.java
View File

@ -178,13 +178,13 @@ public class SnowHeightMap {
++blocksChanged; ++blocksChanged;
// Grow -- start from 1 below top replacing airblocks // Grow -- start from 1 below top replacing airblocks
for (int y = (int) newHeight - 1 - originY; y >= 0; --y) { for (int y = (int) Math.floor(newHeight - 1 - originY); y >= 0; --y) {
if (y >= newHeight - 1 - originY - layerBlocks) { if (y >= Math.floor(newHeight - 1 - originY - layerBlocks)) {
//FAWE start - avoid BlockVector3 creation for no reason //FAWE start - avoid BlockVector3 creation for no reason
session.setBlock(xr, originY + y, zr, fillerSnow); session.setBlock(xr, originY + y, zr, fillerSnow);
//FAWE end //FAWE end
} else { } else {
int copyFrom = (int) (y * scale); int copyFrom = (int) Math.floor(y * scale);
//FAWE start - avoid BlockVector3 creation for no reason //FAWE start - avoid BlockVector3 creation for no reason
BlockState block = session.getBlock(xr, originY + copyFrom, zr); BlockState block = session.getBlock(xr, originY + copyFrom, zr);
session.setBlock(xr, originY + y, zr, block); session.setBlock(xr, originY + y, zr, block);
@ -195,13 +195,13 @@ public class SnowHeightMap {
} }
} else { } else {
// Shrink -- start from bottom // Shrink -- start from bottom
for (int y = 0; y < (int) newHeight - originY; ++y) { for (int y = 0; y < (int) Math.floor(newHeight - originY); ++y) {
if (y >= (int) newHeight - originY - layerBlocks) { if (y >= (int) Math.floor(newHeight - originY - layerBlocks)) {
//FAWE start - avoid BlockVector3 creation for no reason //FAWE start - avoid BlockVector3 creation for no reason
session.setBlock(xr, originY + y, zr, fillerSnow); session.setBlock(xr, originY + y, zr, fillerSnow);
//FAWE end //FAWE end
} else { } else {
int copyFrom = (int) (y * scale); int copyFrom = (int) Math.floor(y * scale);
//FAWE start - avoid BlockVector3 creation for no reason //FAWE start - avoid BlockVector3 creation for no reason
BlockState block = session.getBlock(xr, originY + copyFrom, zr); BlockState block = session.getBlock(xr, originY + copyFrom, zr);
session.setBlock(xr, originY + y, zr, block); session.setBlock(xr, originY + y, zr, block);
@ -214,7 +214,7 @@ public class SnowHeightMap {
++blocksChanged; ++blocksChanged;
// Fill rest with air // Fill rest with air
for (int y = (int) newHeight + 1; y <= curHeight; ++y) { for (int y = (int) Math.floor(newHeight + 1); y <= Math.floor(curHeight); ++y) {
//FAWE start - avoid BlockVector3 creation for no reason //FAWE start - avoid BlockVector3 creation for no reason
session.setBlock(xr, y, zr, fillerAir); session.setBlock(xr, y, zr, fillerAir);
//FAWE end //FAWE end
@ -229,7 +229,8 @@ public class SnowHeightMap {
} }
private void setSnowLayer(int x, int z, float newHeight) throws MaxChangedBlocksException { private void setSnowLayer(int x, int z, float newHeight) throws MaxChangedBlocksException {
int numOfLayers = (int) ((newHeight % 1) * 8) + 1; int y = (int) Math.floor(newHeight);
int numOfLayers = (int) ((newHeight - y) * 8) + 1;
//FAWE start - avoid BlockVector3 creation for no reason //FAWE start - avoid BlockVector3 creation for no reason
session.setBlock(x, (int) newHeight, z, BlockTypes.SNOW.getDefaultState().with(LAYERS, numOfLayers)); session.setBlock(x, (int) newHeight, z, BlockTypes.SNOW.getDefaultState().with(LAYERS, numOfLayers));
//FAWE end //FAWE end