This commit is contained in:
Jesse Boyd 2017-09-12 04:06:27 +10:00
parent 8ac2bf6da3
commit ba195c40a1
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
2 changed files with 4 additions and 8 deletions

View File

@ -151,12 +151,9 @@ public class BukkitImageListener implements Listener {
try {
tool = session.getBrushTool(fp.getPlayer(), false);
} catch (InvalidToolBindException e) { return; }
if (tool == null) return;
BrushSettings context = primary ? tool.getPrimary() : tool.getSecondary();
Brush brush = context.getBrush();
ItemFrame[][] frames = viewer.getItemFrames();
if (frames == null || brush == null) {
if (frames == null || tool == null) {
viewer.selectFrame(itemFrame);
TaskManager.IMP.laterAsync(new Runnable() {
@Override
@ -167,6 +164,9 @@ public class BukkitImageListener implements Listener {
return;
}
if (tool == null) return;
BrushSettings context = primary ? tool.getPrimary() : tool.getSecondary();
Brush brush = context.getBrush();
if (brush == null) return;
tool.setContext(context);

View File

@ -310,10 +310,6 @@ public class Settings extends Config {
"Allows brushes to be persistent",
})
public boolean PERSISTENT_BRUSHES = false;
@Comment({
"Allow CFI visualization",
})
public boolean CFI_VISUALIZATION = false;
}