EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 21:26:45 +01:00
Code Issues Projects Releases Wiki Activity

Fix after merge...

Browse Source
This commit is contained in:
Sauilitired 2014-12-18 12:40:30 +01:00
parent 8650525d2b
commit ec3d24876e
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Unclaim.java
View File

@ -64,22 +64,10 @@ public class Unclaim extends SubCommand {
if ((Math.abs(plot.id.x) <= Math.abs(Auto.lastPlot.x)) && (Math.abs(plot.id.y) <= Math.abs(Auto.lastPlot.y))) { if ((Math.abs(plot.id.x) <= Math.abs(Auto.lastPlot.x)) && (Math.abs(plot.id.y) <= Math.abs(Auto.lastPlot.y))) {
Auto.lastPlot = plot.id; Auto.lastPlot = plot.id;
} }
<<<<<<< HEAD
} else { } else {
PlayerFunctions.sendMessage(plr, "Plot removal has been denied."); PlayerFunctions.sendMessage(plr, "Plot removal has been denied.");
} }
=======
<<<<<<< HEAD
}
else {
PlayerFunctions.sendMessage(plr, "Plot unclaim has been denied.");
=======
} else {
PlayerFunctions.sendMessage(plr, "Plot removal has been denied.");
>>>>>>> 73e92b834155ea9e458d7299ad78f4fd9b55aa66
}
PlayerFunctions.sendMessage(plr, C.UNCLAIM_SUCCESS); PlayerFunctions.sendMessage(plr, C.UNCLAIM_SUCCESS);
>>>>>>> drtshock-master
return true; return true;
} }
} }