From fc8fbbb0c476ee8674608c321187a7c1ffbc7bf7 Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Tue, 7 Mar 2017 04:31:54 +1100 Subject: [PATCH] Fixes #395 --- build.gradle | 2 +- core/src/main/java/com/boydti/fawe/config/BBC.java | 9 +++++++-- .../java/com/sk89q/worldedit/command/RegionCommands.java | 2 ++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 1aee6eee..7de491c2 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ ext { date = git.head().date.format("yy.MM.dd") revision = "-${git.head().abbreviatedId}" parents = git.head().parentIds; - index = -84; // Offset to mach CI + index = -85; // Offset to mach CI int major, minor, patch; major = minor = patch = 0; for (;parents != null && !parents.isEmpty();index++) { diff --git a/core/src/main/java/com/boydti/fawe/config/BBC.java b/core/src/main/java/com/boydti/fawe/config/BBC.java index e86c9448..25008e72 100644 --- a/core/src/main/java/com/boydti/fawe/config/BBC.java +++ b/core/src/main/java/com/boydti/fawe/config/BBC.java @@ -73,9 +73,10 @@ public enum BBC { COMMAND_ROTATE("The clipboard has been rotated", "WorldEdit.Rotate"), COMMAND_FLIPPED("The clipboard has been flipped", "WorldEdit.Flip"), - COMMAND_REGEN_0("Region regenerated.\nTip: Use a biome with /regen [biome]", "WorldEdit.Regen"), - COMMAND_REGEN_1("Region regenerated.\nTip: Use a seed with /regen [biome] [seed]", "WorldEdit.Regen"), + COMMAND_REGEN_0("Region regenerated.", "WorldEdit.Regen"), + COMMAND_REGEN_1("Region regenerated.", "WorldEdit.Regen"), COMMAND_REGEN_2("Region regenerated.", "WorldEdit.Regen"), + COMMAND_TREE("%s0 trees created.", "WorldEdit.Tree"), COMMAND_PUMPKIN("%s0 pumpkin patches created.", "WorldEdit.Tree"), COMMAND_FLORA("%s0 flora created.", "WorldEdit.Flora"), @@ -308,6 +309,10 @@ public enum BBC { TIP_BRUSH_RELATIVE("&7Tip: Use a relative clipboard pattern with //br sphere #~:#copy", "Tips"), TIP_BRUSH_COMMAND("&7Tip: Try the command brush &c//br cmd ", "Tips"), + // regen + TIP_REGEN_0("Tip: Use a biome with /regen [biome]", "Tips"), + TIP_REGEN_1("Tip: Use a seed with /regen [biome] [seed]", "Tips"), + diff --git a/core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java b/core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java index 0691b91c..ad43d925 100644 --- a/core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java +++ b/core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java @@ -573,8 +573,10 @@ public class RegionCommands { BBC.COMMAND_REGEN_2.send(player); } else if (biome == null) { BBC.COMMAND_REGEN_0.send(player); + if (!FawePlayer.wrap(player).hasPermission("fawe.tips")) BBC.TIP_REGEN_0.send(player); } else if (seed == null) { BBC.COMMAND_REGEN_1.send(player); + if (!FawePlayer.wrap(player).hasPermission("fawe.tips")) BBC.TIP_REGEN_1.send(player); } else { BBC.COMMAND_REGEN_2.send(player); }