EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-06-25 02:04:44 +02:00
Code Issues Projects Releases Wiki Activity

Tweaked some things

Browse Source
This commit is contained in:
MattBDev
2016-06-02 13:42:32 -04:00
parent da58c7b411
commit cee970e3d9
7 changed files with 59 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Core/src/main/java/com/intellectualcrafters/plot/commands/Merge.java
View File

@ -165,8 +165,8 @@ public class Merge extends SubCommand {
public void run() {
MainUtil.sendMessage(accepter, C.MERGE_ACCEPTED);
plot.autoMerge(dir, maxSize - size, owner, terrain);
PlotPlayer pp = UUIDHandler.getPlayer(player.getUUID());
if (pp == null) {
PlotPlayer plotPlayer = UUIDHandler.getPlayer(player.getUUID());
if (plotPlayer == null) {
sendMessage(accepter, C.MERGE_NOT_VALID);
return;
}

2
Core/src/main/java/com/intellectualcrafters/plot/config/C.java
View File

@ -339,7 +339,7 @@ public enum C {
MERGE_ACCEPTED("$2The merge request has been accepted", "Merge"),
SUCCESS_MERGE("$2Plots have been merged!", "Merge"),
MERGE_REQUESTED("$2Successfully sent a merge request", "Merge"),
MERGE_REQUEST_CONFIRM("merge request from %s", "Permission"),
MERGE_REQUEST_CONFIRM("Merge request from %s", "Permission"),
NO_PERM_MERGE("$2You are not the owner of the plot: $1%plot%", "Merge"),
NO_AVAILABLE_AUTOMERGE("$2You do not own any adjacent plots in the specified direction or are not allowed to merge to the required size.",
"Merge"),

2
Core/src/main/java/com/intellectualcrafters/plot/flag/FlagManager.java
View File

@ -100,7 +100,7 @@ public class FlagManager {
StringBuilder flag_string = new StringBuilder();
int i = 0;
for (Map.Entry<Flag<?>, Object> entry : flags.entrySet()) {
Flag<?> flag = entry.getKey();
Flag flag = entry.getKey();
if (i != 0) {
flag_string.append(',');
}