From b484295aa351c2aef186896ba142500505fed631 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Fri, 5 Feb 2016 15:14:42 +0100 Subject: [PATCH] Change editor messages --- .../command/editor/CommandEditAbstract.java | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/com/massivecraft/massivecore/command/editor/CommandEditAbstract.java b/src/com/massivecraft/massivecore/command/editor/CommandEditAbstract.java index 0d96469a..93e73ee5 100644 --- a/src/com/massivecraft/massivecore/command/editor/CommandEditAbstract.java +++ b/src/com/massivecraft/massivecore/command/editor/CommandEditAbstract.java @@ -7,12 +7,14 @@ import org.bukkit.command.CommandSender; import org.bukkit.permissions.Permission; import com.massivecraft.massivecore.MassiveException; +import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.command.MassiveCommand; import com.massivecraft.massivecore.command.requirement.RequirementEditorUse; import com.massivecraft.massivecore.command.requirement.RequirementHasPerm; import com.massivecraft.massivecore.command.type.Type; import com.massivecraft.massivecore.event.EventMassiveCoreEditorEdit; import com.massivecraft.massivecore.util.PermUtil; +import com.massivecraft.massivecore.util.Txt; public class CommandEditAbstract extends MassiveCommand { @@ -128,14 +130,13 @@ public class CommandEditAbstract extends MassiveCommand msg("%s for %s already: %s", descProperty, descObject, descValue); return; } - - // Startup - // We inform what property and object the edit is taking place on. - msg("%s for %s edited:", descProperty, descObject); + + // Create messages + List messages = new MassiveList<>(); // Before // We inform what the value was before. - msg("Before: %s", descValue); + messages.add(Txt.parse("Before: %s", descValue)); // Apply // We set the new property value. @@ -144,7 +145,15 @@ public class CommandEditAbstract extends MassiveCommand // After // We inform what the value is after. descValue = this.getInheritedVisual(); - msg("After: %s", descValue); + messages.add(Txt.parse("After: %s", descValue)); + + // Startup + // We inform what property and object the edit is taking place on. + // The visual might change after modification, so this should be added after we have made the change. + descObject = this.getObjectVisual(); + messages.add(0, Txt.parse("%s for %s edited:", descProperty, descObject)); + + message(messages); } // -------------------------------------------- //