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

Fixe

Browse Source 
Fixes #753
This commit is contained in:
Jesse Boyd 2015-12-04 20:00:30 +11:00
parent c72edc40f0
commit 35589dcc5f
13 changed files with 310 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -8,7 +8,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<artifactId>PlotSquared</artifactId>
<version>3.2.22</version>
<version>3.2.23</version>
<name>PlotSquared</name>
<packaging>jar</packaging>
<build>

6
src/main/java/com/intellectualcrafters/plot/PS.java
View File

@ -1336,17 +1336,17 @@ public class PS {
}
case "f":
case "floor": {
config.set(base + "plot.floor", Arrays.asList(StringMan.join(Configuration.BLOCKLIST.parseString(value), ",").split(",")));
config.set(base + "plot.floor", new ArrayList<String>(Arrays.asList(StringMan.join(Configuration.BLOCKLIST.parseString(value), ",").split(","))));
break;
}
case "m":
case "main": {
config.set(base + "plot.filling", Arrays.asList(StringMan.join(Configuration.BLOCKLIST.parseString(value), ",").split(",")));
config.set(base + "plot.filling", new ArrayList<String>(Arrays.asList(StringMan.join(Configuration.BLOCKLIST.parseString(value), ",").split(","))));
break;
}
case "w":
case "wall": {
config.set(base + "wall.filling", Arrays.asList(StringMan.join(Configuration.BLOCKLIST.parseString(value), ",").split(",")));
config.set(base + "wall.filling", Configuration.BLOCK.parseString(value).toString());
break;
}
case "b":

45
src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java
View File

@ -218,7 +218,7 @@ public class DebugExec extends SubCommand {
return false;
}
final String flag = args[1];
for (final Plot plot : PS.get().getPlots()) {
for (final Plot plot : PS.get().getBasePlots()) {
if (FlagManager.getPlotFlagRaw(plot, flag) != null) {
FlagManager.removePlotFlag(plot, flag);
}
@ -409,6 +409,49 @@ public class DebugExec extends SubCommand {
}
break;
}
case "allcmd": {
if (args.length < 3) {
C.COMMAND_SYNTAX.send(player, "/plot debugexec allcmd <condition> <command>");
return false;
}
long start = System.currentTimeMillis();
Command<PlotPlayer> cmd = MainCommand.getInstance().getCommand(args[3]);
String[] params = Arrays.copyOfRange(args, 4, args.length);
if (args[1].equals("true")) {
Location loc = (Location) player.getMeta("location");
Plot plot = (Plot) player.getMeta("lastplot");
for (Plot current : PS.get().getBasePlots()) {
player.setMeta("location", current.getBottomAbs());
player.setMeta("lastplot", current);
cmd.onCommand(player, params);
}
if (loc == null) {
player.deleteMeta("location");
} else {
player.setMeta("location", loc);
}
if (plot == null) {
player.deleteMeta("lastplot");
} else {
player.setMeta("lastplot", plot);
}
player.sendMessage("&c> " + (System.currentTimeMillis() - start));
return true;
}
init();
scope.put("_2", params);
scope.put("_3", cmd);
script = "_1=PS.getBasePlots().iterator();while(_1.hasNext()){plot=_1.next();if(" + args[1] + "){PlotPlayer.setMeta(\"location\",plot.getBottomAbs());PlotPlayer.setMeta(\"lastplot\",plot);_3.onCommand(PlotPlayer,_2)}}";
break;
}
case "all": {
if (args.length < 3) {
C.COMMAND_SYNTAX.send(player, "/plot debugexec all <condition> <code>");
return false;
}
script = "_1=PS.getBasePlots().iterator();while(_1.hasNext()){plot=_1.next();if(" + args[1] + "){" + StringMan.join(Arrays.copyOfRange(args, 2, args.length), " ") + "}}";
break;
}
default: {
script = StringMan.join(args, " ");
}

28
src/main/java/com/intellectualcrafters/plot/commands/MainCommand.java
View File

@ -210,6 +210,8 @@ public class MainCommand extends CommandManager<PlotPlayer> {
int help_index = -1;
String category = null;
Location loc = null;
Plot plot = null;
boolean tp = false;
switch (args.length) {
case 0: {
help_index = 0;
@ -268,15 +270,21 @@ public class MainCommand extends CommandManager<PlotPlayer> {
default: {
if (args.length >= 2) {
String world = player.getLocation().getWorld();
Plot plot = Plot.fromString(world, args[0]);
if (plot == null) {
Plot newPlot = Plot.fromString(world, args[0]);
if (newPlot == null) {
break;
}
if (!ConsolePlayer.isConsole(player) && (!plot.world.equals(world) || plot.isDenied(player.getUUID())) && !Permissions.hasPermission(player, C.PERMISSION_ADMIN)) {
if (!ConsolePlayer.isConsole(player) && (!newPlot.world.equals(world) || newPlot.isDenied(player.getUUID())) && !Permissions.hasPermission(player, C.PERMISSION_ADMIN)) {
break;
}
// Save meta
loc = (Location) player.getMeta("location");
player.setMeta("location", plot.getBottomAbs());
plot = (Plot) player.getMeta("lastplot");
tp = true;
// Set loc
player.setMeta("location", newPlot.getBottomAbs());
player.setMeta("lastplot", newPlot);
// Trim command
args = Arrays.copyOfRange(args, 1, args.length);
}
}
@ -292,9 +300,19 @@ public class MainCommand extends CommandManager<PlotPlayer> {
}
String fullCmd = StringMan.join(args, " ");
getInstance().handle(player, cmd + " " + fullCmd);
if (loc != null) {
// Restore location
if (tp) {
if (loc == null) {
player.deleteMeta("location");
} else {
player.setMeta("location", loc);
}
if (plot == null) {
player.deleteMeta("lastplot");
} else {
player.setMeta("lastplot", plot);
}
}
return true;
}

10
src/main/java/com/intellectualcrafters/plot/object/ConsolePlayer.java
View File

@ -15,7 +15,6 @@ import com.intellectualcrafters.plot.util.PlotWeather;
public class ConsolePlayer extends PlotPlayer {
private static ConsolePlayer instance;
private Location loc;
private final HashMap<String, Object> meta;
public static ConsolePlayer getConsole() {
@ -38,8 +37,9 @@ public class ConsolePlayer extends PlotPlayer {
} else {
world = "world";
}
loc = new Location(world, 0, 0, 0);
meta = new HashMap<>();
Location loc = new Location(world, 0, 0, 0);
setMeta("location", loc);
}
public static boolean isConsole(final PlotPlayer plr) {
@ -53,12 +53,12 @@ public class ConsolePlayer extends PlotPlayer {
@Override
public Location getLocation() {
return loc;
return (Location) getMeta("location");
}
@Override
public Location getLocationFull() {
return loc;
return (Location) getMeta("location");
}
@Override
@ -85,7 +85,7 @@ public class ConsolePlayer extends PlotPlayer {
public void teleport(final Location loc) {
final Plot plot = MainUtil.getPlot(loc);
setMeta("lastplot", plot);
this.loc = loc;
setMeta("location", loc);
}
@Override

13
src/main/java/com/intellectualcrafters/plot/object/PlotPlayer.java
View File

@ -7,14 +7,15 @@ import java.util.concurrent.ConcurrentHashMap;
import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.commands.RequiredType;
import com.intellectualcrafters.plot.config.Settings;
import com.intellectualcrafters.plot.util.CmdConfirm;
import com.intellectualcrafters.plot.util.EventUtil;
import com.intellectualcrafters.plot.util.ExpireManager;
import com.intellectualcrafters.plot.util.MainUtil;
import com.intellectualcrafters.plot.util.PlotGamemode;
import com.intellectualcrafters.plot.util.PlotWeather;
import com.intellectualcrafters.plot.util.SetupUtils;
import com.intellectualcrafters.plot.util.UUIDHandler;
import com.plotsquared.general.commands.CommandCaller;
import com.plotsquared.listener.PlotListener;
/**
* The PlotPlayer class<br>
@ -321,17 +322,19 @@ public abstract class PlotPlayer implements CommandCaller {
public void unregister() {
final Plot plot = getCurrentPlot();
if (plot != null) {
PlotListener.plotExit(this, plot);
EventUtil.manager.callLeave(this, plot);
}
ExpireManager.dates.put(getUUID(), System.currentTimeMillis());
EventUtil.unregisterPlayer(this);
if (Settings.DELETE_PLOTS_ON_BAN && isBanned()) {
for (final Plot owned : PS.get().getPlotsInWorld(getName())) {
owned.deletePlot(null);
PS.debug(String.format("&cPlot &6%s &cwas deleted + cleared due to &6%s&c getting banned", plot.getId(), getName()));
}
}
UUIDHandler.getPlayers().remove(getName());
String name = getName();
ExpireManager.dates.put(getUUID(), System.currentTimeMillis());
SetupUtils.setupMap.remove(name);
CmdConfirm.removePending(name);
UUIDHandler.getPlayers().remove(name);
PS.get().IMP.unregister(this);
}
}

5
src/main/java/com/intellectualcrafters/plot/object/PlotWorld.java
View File

@ -284,6 +284,11 @@ public abstract class PlotWorld {
}
}
@Override
public String toString() {
return worldname;
}
/**
* Used for the <b>/plot setup</b> command Return null if you do not want to support this feature
*

10
src/main/java/com/intellectualcrafters/plot/util/EventUtil.java
View File

@ -4,7 +4,6 @@ import java.util.ArrayList;
import java.util.HashSet;
import java.util.UUID;
import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.flag.Flag;
import com.intellectualcrafters.plot.flag.FlagManager;
@ -22,15 +21,6 @@ public abstract class EventUtil {
public static EventUtil manager = null;
public static void unregisterPlayer(final PlotPlayer player) {
final String name = player.getName();
if (SetupUtils.setupMap.containsKey(name)) {
SetupUtils.setupMap.remove(name);
}
CmdConfirm.removePending(name);
PS.get().IMP.unregister(player);
}
public abstract Rating callRating(final PlotPlayer player, final Plot plot, final Rating rating);
public abstract boolean callClaim(final PlotPlayer player, final Plot plot, final boolean auto);

9
src/main/java/com/intellectualcrafters/plot/util/UUIDHandlerImplementation.java
View File

@ -108,10 +108,13 @@ public abstract class UUIDHandlerImplementation {
* lazy UUID conversion:
* - Useful if the person misconfigured the database, or settings before PlotMe conversion
*/
if (!Settings.OFFLINE_MODE) {
if (!Settings.OFFLINE_MODE && unknown.size() > 0) {
TaskManager.runTaskAsync(new Runnable() {
@Override
public void run() {
UUID offline = UUID.nameUUIDFromBytes(("OfflinePlayer:" + name.value).getBytes(Charsets.UTF_8));
if (!unknown.contains(offline) && !name.value.equals(name.value.toLowerCase())) {
offline = UUID.nameUUIDFromBytes(("OfflinePlayer:" + name.value).getBytes(Charsets.UTF_8));
offline = UUID.nameUUIDFromBytes(("OfflinePlayer:" + name.value.toLowerCase()).getBytes(Charsets.UTF_8));
if (!unknown.contains(offline)) {
offline = null;
}
@ -130,6 +133,8 @@ public abstract class UUIDHandlerImplementation {
}
}
}
});
}
try {
final UUID offline = uuidMap.put(name, uuid);
if (offline != null) {

100
src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java
View File

@ -74,9 +74,7 @@ import org.bukkit.event.player.PlayerCommandPreprocessEvent;
import org.bukkit.event.player.PlayerEggThrowEvent;
import org.bukkit.event.player.PlayerInteractEntityEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerLoginEvent;
import org.bukkit.event.player.PlayerLoginEvent.Result;
import org.bukkit.event.player.PlayerMoveEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.event.player.PlayerTeleportEvent;
@ -96,7 +94,6 @@ import org.bukkit.util.Vector;
import com.intellectualcrafters.plot.PS;
import com.intellectualcrafters.plot.config.C;
import com.intellectualcrafters.plot.config.Settings;
import com.intellectualcrafters.plot.database.DBFunc;
import com.intellectualcrafters.plot.flag.Flag;
import com.intellectualcrafters.plot.flag.FlagManager;
import com.intellectualcrafters.plot.object.Location;
@ -407,33 +404,33 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen
}
}
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onConnect(final PlayerLoginEvent event) {
final Player player = event.getPlayer();
final String name = player.getName();
BukkitUtil.getPlayer(event.getPlayer()).unregister();
final PlotPlayer pp = BukkitUtil.getPlayer(player);
if (name.equals("PlotSquared") || pp.getUUID().equals(DBFunc.everyone)) {
event.disallow(Result.KICK_WHITELIST, "This account is reserved");
BukkitUtil.removePlayer(pp.getName());
}
}
// Now
String name = pp.getName();
StringWrapper sw = new StringWrapper(name);
final UUID uuid = pp.getUUID();
UUIDHandler.add(sw, uuid);
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onJoin(final PlayerJoinEvent event) {
final Player player = event.getPlayer();
Location loc = pp.getLocation();
final Plot plot = MainUtil.getPlotAbs(loc);
if (plot != null) {
plotEntry(pp, plot);
}
// Delayed
{
}
// Async
TaskManager.runTaskLaterAsync(new Runnable() {
@Override
public void run() {
if (!player.hasPlayedBefore()) {
player.saveData();
}
BukkitUtil.getPlayer(event.getPlayer()).unregister();;
final PlotPlayer pp = BukkitUtil.getPlayer(player);
// Set last location
pp.setMeta("location", BukkitUtil.getLocation(player.getLocation()));
final String username = pp.getName();
final StringWrapper name = new StringWrapper(username);
final UUID uuid = pp.getUUID();
UUIDHandler.add(name, uuid);
ExpireManager.dates.put(uuid, System.currentTimeMillis());
if (BukkitMain.worldEdit != null) {
if (pp.getAttribute("worldedit")) {
@ -441,23 +438,14 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen
}
}
if ((PS.get().update != null) && Permissions.hasPermission(pp, C.PERMISSION_ADMIN_UPDATE) && Settings.UPDATE_NOTIFICATIONS) {
TaskManager.runTaskLater(new Runnable() {
@Override
public void run() {
MainUtil.sendMessage(pp, "&6An update for PlotSquared is available: &7/plot update");
}
}, 20);
}
final Location loc = BukkitUtil.getLocation(player.getLocation());
final Plot plot = MainUtil.getPlot(loc);
if (plot == null) {
return;
}
if (Settings.TELEPORT_ON_LOGIN) {
if (Settings.TELEPORT_ON_LOGIN && plot != null) {
MainUtil.teleportPlayer(pp, pp.getLocation(), plot);
MainUtil.sendMessage(pp, C.TELEPORTED_TO_ROAD);
}
plotEntry(pp, plot);
}
}, 20);
}
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
@ -740,8 +728,7 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen
}
}
if (Settings.PERMISSION_CACHING) {
((BukkitPlayer) pp).hasPerm = new HashSet<>();
((BukkitPlayer) pp).noPerm = new HashSet<>();
pp.deleteMeta("perm");
}
}
@ -1225,9 +1212,8 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen
if (entity instanceof Player) {
return;
}
final Location loc = BukkitUtil.getLocation(event.getLocation());
final String world = loc.getWorld();
final PlotWorld plotworld = PS.get().getPlotWorld(world);
final Location loc = BukkitUtil.getLocation(entity.getLocation());
final PlotWorld plotworld = loc.getPlotWorld();
if (plotworld == null) {
return;
}
@ -1235,18 +1221,28 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen
return;
}
final CreatureSpawnEvent.SpawnReason reason = event.getSpawnReason();
if (((reason == CreatureSpawnEvent.SpawnReason.SPAWNER_EGG) || (reason == CreatureSpawnEvent.SpawnReason.DISPENSE_EGG)) && !plotworld.SPAWN_EGGS) {
event.setCancelled(true);
return;
} else if ((reason == CreatureSpawnEvent.SpawnReason.BREEDING) && !plotworld.SPAWN_BREEDING) {
event.setCancelled(true);
return;
} else if ((reason == CreatureSpawnEvent.SpawnReason.CUSTOM) && !plotworld.SPAWN_CUSTOM && !(event.getEntityType().getTypeId() == 30)) {
switch (reason) {
case SPAWNER_EGG:
case DISPENSE_EGG:
if (!plotworld.SPAWN_EGGS) {
event.setCancelled(true);
return;
}
final Plot plot = MainUtil.getPlot(loc);
break;
case BREEDING:
if (!plotworld.SPAWN_BREEDING) {
event.setCancelled(true);
return;
}
break;
case CUSTOM:
if (!plotworld.SPAWN_CUSTOM && entity.getType().getTypeId() != 30) {
event.setCancelled(true);
return;
}
break;
}
final Plot plot = MainUtil.getPlotAbs(loc);
if (checkEntity(entity, plot)) {
event.setCancelled(true);
return;
@ -1342,7 +1338,9 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen
}
public boolean checkEntity(final Entity entity, final Plot plot) {
if ((plot != null) && (plot.owner != null)) {
if (plot == null || plot.owner == null || plot.settings == null || (plot.settings.flags.size() == 0 && plot.getWorld().DEFAULT_FLAGS.size() == 0)) {
return false;
}
switch (entity.getType()) {
case PLAYER: {
return false;
@ -1451,8 +1449,6 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen
}
}
}
return false;
}
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onBlockIgnite(final BlockIgniteEvent e) {

4
src/main/java/com/plotsquared/bukkit/listeners/PlotPlusListener.java
View File

@ -65,6 +65,7 @@ public class PlotPlusListener extends PlotListener implements Listener {
plugin.getServer().getScheduler().scheduleSyncRepeatingTask(plugin, new Runnable() {
@Override
public void run() {
if (healRunnable.size() > 0) {
for (final Iterator<Entry<String, Interval>> iter = healRunnable.entrySet().iterator(); iter.hasNext();) {
final Entry<String, Interval> entry = iter.next();
final Interval value = entry.getValue();
@ -82,6 +83,8 @@ public class PlotPlusListener extends PlotListener implements Listener {
}
}
}
}
if (feedRunnable.size() > 0) {
for (final Iterator<Entry<String, Interval>> iter = feedRunnable.entrySet().iterator(); iter.hasNext();) {
final Entry<String, Interval> entry = iter.next();
final Interval value = entry.getValue();
@ -100,6 +103,7 @@ public class PlotPlusListener extends PlotListener implements Listener {
}
}
}
}
}, 0l, 20l);
}

3
src/main/java/com/plotsquared/bukkit/object/BukkitPlayer.java
View File

@ -1,6 +1,5 @@
package com.plotsquared.bukkit.object;
import java.util.HashSet;
import java.util.UUID;
import org.bukkit.Bukkit;
@ -29,8 +28,6 @@ public class BukkitPlayer extends PlotPlayer {
private UUID uuid;
private String name;
private long last = 0;
public HashSet<String> hasPerm = new HashSet<>();
public HashSet<String> noPerm = new HashSet<>();
public boolean offline;
/**

BIN
target/PlotSquared-Bukkit.jar
View File

Binary file not shown.