Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-23 12:06:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'drtshock-master'

Browse Source 
Conflicts:
	PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Unclaim.java
	PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/WorldEditListener.java
This commit is contained in:
Sauilitired 2014-12-18 12:37:22 +01:00
commit 8650525d2b
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,9 +64,22 @@ 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))) {
Auto.lastPlot = plot.id;
}
<<<<<<< HEAD
} else {
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);
>>>>>>> drtshock-master
return true;
}
}

21
PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/WorldEditListener.java
View File

@ -21,6 +21,27 @@
package com.intellectualcrafters.plot.listeners;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerChangedWorldEvent;
import org.bukkit.event.player.PlayerCommandPreprocessEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerMoveEvent;
import org.bukkit.event.player.PlayerPortalEvent;
import org.bukkit.event.player.PlayerTeleportEvent;
import com.intellectualcrafters.plot.PlotMain;
import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.config.Settings;