Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-07-05 00:20:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't allow blocks as brushes

Browse Source 
fixes #748
This commit is contained in:
dordsor21 2020-12-11 17:02:54 +00:00
parent ae39f7bba3
commit 26e3e56988
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java
View File

@ -1066,13 +1066,13 @@ public class LocalSession implements TextureHolder {
private transient boolean loadDefaults = true; private transient boolean loadDefaults = true;
public Tool getTool(BaseItem item, Player player) { public Tool getTool(BaseItem item, Player player) {
loadDefaults(player, false);
if (Settings.IMP.EXPERIMENTAL.PERSISTENT_BRUSHES && item.getNativeItem() != null) { if (Settings.IMP.EXPERIMENTAL.PERSISTENT_BRUSHES && item.getNativeItem() != null) {
BrushTool tool = BrushCache.getTool(player, this, item); BrushTool tool = BrushCache.getTool(player, this, item);
if (tool != null) { if (tool != null) {
return tool; return tool;
} }
} }
loadDefaults(player, false);
return getTool(item.getType()); return getTool(item.getType());
} }
@ -1122,6 +1122,9 @@ public class LocalSession implements TextureHolder {
} }
public BrushTool getBrushTool(BaseItem item, Player player, boolean create) throws InvalidToolBindException { public BrushTool getBrushTool(BaseItem item, Player player, boolean create) throws InvalidToolBindException {
if (item.getType().hasBlockType()) {
throw new InvalidToolBindException(item.getType(), "Blocks can't be used");
}
Tool tool = getTool(item, player); Tool tool = getTool(item, player);
if (!(tool instanceof BrushTool)) { if (!(tool instanceof BrushTool)) {
if (create) { if (create) {