From 5eff53f1f837f5111780b1c60625fe83fc490a93 Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Thu, 4 Aug 2016 20:01:47 +1000 Subject: [PATCH] Remove duplicate method --- .../src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java | 6 ------ bukkit110/src/main/resources/plugin.yml | 3 --- bukkit1710/src/main/resources/plugin.yml | 3 --- bukkit18/src/main/resources/plugin.yml | 3 --- bukkit19/src/main/resources/plugin.yml | 3 --- core/src/main/java/com/boydti/fawe/Fawe.java | 2 -- 6 files changed, 20 deletions(-) diff --git a/bukkit0/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java b/bukkit0/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java index 7825b78f..669c5a1c 100644 --- a/bukkit0/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java +++ b/bukkit0/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java @@ -219,12 +219,6 @@ public class FaweBukkit implements IFawe, Listener { return world.getName(); } - @Override - public String getUserName(UUID uuid) { - String name = Bukkit.getOfflinePlayer(uuid).getName(); - return name != null ? name : uuid.toString(); - } - /** * A mask manager handles region restrictions e.g. PlotSquared plots / WorldGuard regions */ diff --git a/bukkit110/src/main/resources/plugin.yml b/bukkit110/src/main/resources/plugin.yml index 97a1106a..2a71074a 100644 --- a/bukkit110/src/main/resources/plugin.yml +++ b/bukkit110/src/main/resources/plugin.yml @@ -21,9 +21,6 @@ commands: select: description: (FAWE) Select your current WorldEdit Region. aliases: [/select,wer,/wer,worldeditregion,/worldeditregion,/region] - frb: - description: (FAWE) Rollback an edit - aliases: [fawerollback,fawerb,/uu,/rb,/frb,/fawerollback,/fawerb] fcancel: description: (FAWE) Cancel your edit aliases: [fawecancel,/fcancel,/cancel,/fawecancel] diff --git a/bukkit1710/src/main/resources/plugin.yml b/bukkit1710/src/main/resources/plugin.yml index 79ad4207..144b80f2 100644 --- a/bukkit1710/src/main/resources/plugin.yml +++ b/bukkit1710/src/main/resources/plugin.yml @@ -21,9 +21,6 @@ commands: select: description: (FAWE) Select your current WorldEdit Region. aliases: [/select,wer,/wer,worldeditregion,/worldeditregion,/region] - frb: - description: (FAWE) Rollback an edit - aliases: [fawerollback,fawerb,/uu,/rb,/frb,/fawerollback,/fawerb] fcancel: description: (FAWE) Cancel your edit aliases: [fawecancel,/fcancel,/cancel,/fawecancel] diff --git a/bukkit18/src/main/resources/plugin.yml b/bukkit18/src/main/resources/plugin.yml index 475cd05b..6f93d1b0 100644 --- a/bukkit18/src/main/resources/plugin.yml +++ b/bukkit18/src/main/resources/plugin.yml @@ -21,9 +21,6 @@ commands: select: description: (FAWE) Select your current WorldEdit Region. aliases: [/select,wer,/wer,worldeditregion,/worldeditregion,/region] - frb: - description: (FAWE) Rollback an edit - aliases: [fawerollback,fawerb,/uu,/rb,/frb,/fawerollback,/fawerb] fcancel: description: (FAWE) Cancel your edit aliases: [fawecancel,/fcancel,/cancel,/fawecancel] diff --git a/bukkit19/src/main/resources/plugin.yml b/bukkit19/src/main/resources/plugin.yml index 78f59b58..7c172f18 100644 --- a/bukkit19/src/main/resources/plugin.yml +++ b/bukkit19/src/main/resources/plugin.yml @@ -24,9 +24,6 @@ commands: select: description: (FAWE) Select your current WorldEdit Region. aliases: [/select,wer,/wer,worldeditregion,/worldeditregion,/region] - frb: - description: (FAWE) Rollback an edit - aliases: [fawerollback,fawerb,/uu,/rb,/frb,/fawerollback,/fawerb] fcancel: description: (FAWE) Cancel your edit aliases: [fawecancel,/fcancel,/cancel,/fawecancel] diff --git a/core/src/main/java/com/boydti/fawe/Fawe.java b/core/src/main/java/com/boydti/fawe/Fawe.java index 052ed2d1..deb36d46 100644 --- a/core/src/main/java/com/boydti/fawe/Fawe.java +++ b/core/src/main/java/com/boydti/fawe/Fawe.java @@ -2,7 +2,6 @@ package com.boydti.fawe; import com.boydti.fawe.command.Cancel; import com.boydti.fawe.command.Reload; -import com.boydti.fawe.command.Rollback; import com.boydti.fawe.command.Stream; import com.boydti.fawe.command.Wea; import com.boydti.fawe.command.WorldEditRegion; @@ -230,7 +229,6 @@ public class Fawe { this.IMP.setupCommand("stream", new Stream()); this.IMP.setupCommand("select", new WorldEditRegion()); this.IMP.setupCommand("fawe", new Reload()); - this.IMP.setupCommand("frb", new Rollback()); this.IMP.setupCommand("fcancel", new Cancel()); }