From aa04b0c32654b266d7179489b298f8b46f075aeb Mon Sep 17 00:00:00 2001 From: MattBDev <4009945+MattBDev@users.noreply.github.com> Date: Wed, 5 Feb 2020 10:40:29 -0500 Subject: [PATCH] World checks in BrushSettings don't offer any performance benefit --- .../boydti/fawe/object/brush/BrushSettings.java | 15 --------------- .../sk89q/worldedit/command/tool/BrushTool.java | 2 +- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/worldedit-core/src/main/java/com/boydti/fawe/object/brush/BrushSettings.java b/worldedit-core/src/main/java/com/boydti/fawe/object/brush/BrushSettings.java index 24134f122..2b299739c 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/object/brush/BrushSettings.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/object/brush/BrushSettings.java @@ -51,7 +51,6 @@ public class BrushSettings { private Expression size = DEFAULT_SIZE; private Set permissions; private Scroll scrollAction; - private String lastWorld; public BrushSettings() { this.permissions = new HashSet<>(); @@ -213,20 +212,6 @@ public class BrushSettings { return this; } - /** - * Set the world the brush is being used in - * @param world - * @return true if the world differs from the last used world - */ - public boolean setWorld(String world) { - boolean result = false; - if (this.lastWorld != null && !this.lastWorld.equalsIgnoreCase(world)) { - result = true; - } - this.lastWorld = world; - return result; - } - public Brush getBrush() { return brush; } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BrushTool.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BrushTool.java index 6a86136e9..a52ed7f95 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BrushTool.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BrushTool.java @@ -491,7 +491,7 @@ public class BrushTool implements DoubleActionTraceTool, ScrollTool, MovableTool Brush brush = current.getBrush(); if (brush == null) return false; - if (current.setWorld(player.getWorld().getName()) && !current.canUse(player)) { + if (!current.canUse(player)) { player.print(Caption.of("fawe.error.no-perm" , StringMan.join(current.getPermissions(), ","))); return false; }