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

Fix out of bounds error for erode and pull brushes (#2554)

Browse Source 
- Fixes #2380
This commit is contained in:
Zeranny 2024-01-28 12:10:48 +00:00 committed by GitHub
parent b919633a87
commit 763a497cdc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/brush/ErodeBrush.java
View File

@ -67,11 +67,11 @@ public class ErodeBrush implements Brush {
final int by = target.getBlockY(); final int by = target.getBlockY();
final int bz = target.getBlockZ(); final int bz = target.getBlockZ();
for (int x = -brushSize, relx = 0; x <= brushSize; x++, relx++) { for (int x = -brushSize, relx = 0; x <= brushSize && relx < buffer1.getWidth(); x++, relx++) {
int x0 = x + bx; int x0 = x + bx;
for (int y = -brushSize, rely = 0; y <= brushSize; y++, rely++) { for (int y = -brushSize, rely = 0; y <= brushSize && rely < buffer1.getHeight(); y++, rely++) {
int y0 = y + by; int y0 = y + by;
for (int z = -brushSize, relz = 0; z <= brushSize; z++, relz++) { for (int z = -brushSize, relz = 0; z <= brushSize && relz < buffer1.getLength(); z++, relz++) {
int z0 = z + bz; int z0 = z + bz;
BlockState state = es.getBlock(x0, y0, z0); BlockState state = es.getBlock(x0, y0, z0);
buffer1.setBlock(relx, rely, relz, state); buffer1.setBlock(relx, rely, relz, state);
@ -115,11 +115,11 @@ public class ErodeBrush implements Brush {
Clipboard current, Clipboard target Clipboard current, Clipboard target
) { ) {
int[] frequency = null; int[] frequency = null;
for (int x = -brushSize, relx = 0; x <= brushSize; x++, relx++) { for (int x = -brushSize, relx = 0; x <= brushSize && relx < target.getWidth(); x++, relx++) {
int x2 = x * x; int x2 = x * x;
for (int z = -brushSize, relz = 0; z <= brushSize; z++, relz++) { for (int z = -brushSize, relz = 0; z <= brushSize && relz < target.getLength(); z++, relz++) {
int x2y2 = x2 + z * z; int x2y2 = x2 + z * z;
for (int y = -brushSize, rely = 0; y <= brushSize; y++, rely++) { for (int y = -brushSize, rely = 0; y <= brushSize && rely < target.getHeight(); y++, rely++) {
int cube = x2y2 + y * y; int cube = x2y2 + y * y;
target.setBlock(relx, rely, relz, current.getBlock(relx, rely, relz)); target.setBlock(relx, rely, relz, current.getBlock(relx, rely, relz));
if (cube >= brushSizeSquared) { if (cube >= brushSizeSquared) {
@ -166,11 +166,11 @@ public class ErodeBrush implements Brush {
Clipboard current, Clipboard target Clipboard current, Clipboard target
) { ) {
int[] frequency = null; int[] frequency = null;
for (int x = -brushSize, relx = 0; x <= brushSize; x++, relx++) { for (int x = -brushSize, relx = 0; x <= brushSize && relx < target.getWidth(); x++, relx++) {
int x2 = x * x; int x2 = x * x;
for (int z = -brushSize, relz = 0; z <= brushSize; z++, relz++) { for (int z = -brushSize, relz = 0; z <= brushSize && relz < target.getLength(); z++, relz++) {
int x2y2 = x2 + z * z; int x2y2 = x2 + z * z;
for (int y = -brushSize, rely = 0; y <= brushSize; y++, rely++) { for (int y = -brushSize, rely = 0; y <= brushSize && rely < target.getHeight(); y++, rely++) {
int cube = x2y2 + y * y; int cube = x2y2 + y * y;
target.setBlock(relx, rely, relz, current.getBlock(relx, rely, relz)); target.setBlock(relx, rely, relz, current.getBlock(relx, rely, relz));
if (cube >= brushSizeSquared) { if (cube >= brushSizeSquared) {