Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-06-12 12:33:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
MattBDev
2021-02-11 11:45:11 -05:00
parent 8b1f043dc5 83e5e8ea27
commit 8981a5c484
9 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/DiskOptimizedClipboard.java
View File

@ -78,7 +78,7 @@ public class DiskOptimizedClipboard extends LinearClipboard implements Closeable
public DiskOptimizedClipboard(BlockVector3 dimensions, File file) {
super(dimensions);
if (HEADER_SIZE + ((long) getVolume() << 1) >= Integer.MAX_VALUE) {
throw new IllegalArgumentException("Dimensions too large for this clipboard format");
throw new IllegalArgumentException("Dimensions too large for this clipboard format. Use //lazycopy for large selections.");
} else if (HEADER_SIZE + ((long) getVolume() << 1) + (long) ((getHeight() >> 2) + 1) * ((getLength() >> 2) + 1) * ((getWidth() >> 2) + 1) >= Integer.MAX_VALUE) {
log.error("Dimensions are too large for biomes to be stored in a DiskOptimizedClipboard");
canHaveBiomes = false;

1
worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java
View File

@ -344,7 +344,6 @@ public class BrushCommands {
@Switch(name = 'd', desc = "sags the catenary toward the facing direction")
boolean facingDirection) throws WorldEditException {
worldEdit.checkMaxBrushRadius(radius);
Brush brush = new CatenaryBrush(shell, select, facingDirection, lengthFactor);
set(context, new CatenaryBrush(shell, select, facingDirection, lengthFactor))
.setSize(radius).setFill(fill);
}

2
worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolUtilCommands.java
View File

@ -284,7 +284,7 @@ public class ToolUtilCommands {
)
@CommandPermissions("worldedit.brush.targetoffset")
public void targetOffset(Player player, EditSession editSession, LocalSession session,
int offset) throws WorldEditException {
@Arg(name = "offset", desc = "offset", def = "0") int offset) throws WorldEditException {
BrushTool tool = session.getBrushTool(player, false);
if (tool == null) {
player.print(TranslatableComponent.of("fawe.worldedit.brush.brush.none"));

1
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypesCache.java
View File

@ -205,7 +205,6 @@ public class BlockTypesCache {
String defaultState = blockMap.remove(id);
if (defaultState == null) {
if (internalId != 0) {
getLogger(BlockTypesCache.class).info("Ignoring invalid block {}", id);
continue;
}
defaultState = id;