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

Minor Fixes to PlotMain

Browse Source
This commit is contained in:
Sauilitired 2014-12-19 01:42:47 +01:00
parent ec3d24876e
commit 7334d5f4f7
1 changed files with 16 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotMain.java
View File

@ -72,7 +72,6 @@ import java.util.concurrent.TimeUnit;
* @author Empire92 * @author Empire92
*/ */
@SuppressWarnings("unused") public class PlotMain extends JavaPlugin { @SuppressWarnings("unused") public class PlotMain extends JavaPlugin {
private static PlotMain main = null;
/** /**
* Permission that allows for "everything" * Permission that allows for "everything"
*/ */
@ -85,7 +84,6 @@ import java.util.concurrent.TimeUnit;
* Boolean Flags (material) * Boolean Flags (material)
*/ */
public final static HashMap<Material, String> booleanFlags = new HashMap<>(); public final static HashMap<Material, String> booleanFlags = new HashMap<>();
/** /**
* Initialize the material flags * Initialize the material flags
*/ */
@ -103,7 +101,6 @@ import java.util.concurrent.TimeUnit;
booleanFlags.put(Material.DISPENSER, "dispenser"); booleanFlags.put(Material.DISPENSER, "dispenser");
booleanFlags.put(Material.DROPPER, "dropper"); booleanFlags.put(Material.DROPPER, "dropper");
} }
/** /**
* All loaded plot worlds * All loaded plot worlds
*/ */
@ -156,6 +153,7 @@ import java.util.concurrent.TimeUnit;
* Use Economy? * Use Economy?
*/ */
public static boolean useEconomy = false; public static boolean useEconomy = false;
private static PlotMain main = null;
/** /**
* The UUID Saver * The UUID Saver
*/ */
@ -647,7 +645,7 @@ import java.util.concurrent.TimeUnit;
player.teleport(location); player.teleport(location);
PlayerFunctions.sendMessage(player, C.TELEPORTED_TO_PLOT); PlayerFunctions.sendMessage(player, C.TELEPORTED_TO_PLOT);
} }
return event.isCancelled(); return !event.isCancelled();
} }
/** /**
@ -816,80 +814,21 @@ import java.util.concurrent.TimeUnit;
sendConsoleSenderMessage(C.PREFIX.s() + "KillAllEntities has been running for 60 minutes. Errors: " + this.error); sendConsoleSenderMessage(C.PREFIX.s() + "KillAllEntities has been running for 60 minutes. Errors: " + this.error);
this.error = 0l; this.error = 0l;
} }
World world;
for (final String w : getPlotWorlds()) { for (final String w : getPlotWorlds()) {
getWorldSettings(w); getWorldSettings(w);
final World world = Bukkit.getServer().getWorld(w); world = Bukkit.getServer().getWorld(w);
try { try {
if (world.getLoadedChunks().length < 1) { if (world.getLoadedChunks().length < 1) {
continue; continue;
} }
for (final Chunk chunk : world.getLoadedChunks()) { for (final Chunk chunk : world.getLoadedChunks()) {
final Entity[] entities = chunk.getEntities(); final Entity[] entities = chunk.getEntities();
Entity entity;
for (int i = entities.length - 1; i >= 0; i--) { for (int i = entities.length - 1; i >= 0; i--) {
final Entity entity = entities[i]; if (!((entity = entities[i]) instanceof Player) && !PlotListener.isInPlot(entity.getLocation())) {
if ((entity instanceof Player) || PlotListener.isInPlot(entity.getLocation())) { entity.remove();
continue;
} }
entity.remove();
// boolean tamed = false;
// if (Settings.MOB_PATHFINDING) {
// if (entity instanceof Tameable) {
// Tameable tameable = (Tameable) entity;
// if (tameable.isTamed()) {
// tamed = true;
// }
// }
// else
// if (entity instanceof LivingEntity) {
// LivingEntity livingEntity = ((LivingEntity)
// entity);
// if (livingEntity.getCustomName() != null) {
// tamed = true;
// }
// }
// if (!tamed) {
// entity.remove();
// continue;
// }
// boolean found = false;
// int radius = 1;
// int dir = 0;
// int x = this.location.getBlockX();
// int y = this.location.getBlockY();
// int z = this.location.getBlockZ();
// while (!found && (radius < 4)) {
// Location pos;
// switch (dir) {
// case 0:
// pos = new Location(world, x + radius, y, z);
// dir++;
// break;
// case 1:
// pos = new Location(world, x, y, z + radius);
// dir++;
// break;
// case 2:
// pos = new Location(world, x - radius, y, z);
// dir++;
// break;
// case 3:
// pos = new Location(world, x, y, z - radius);
// dir = 0;
// radius++;
// break;
// default:
// pos = this.location;
// break;
//
// }
// if (PlayerEvents.isInPlot(pos)) {
// entity.teleport(pos.add(0.5, 0, 0.5));
// found = true;
// break;
// }
// }
// entity.teleport(this.location.subtract(this.location.getDirection().normalize().multiply(2)));
// }
} }
} }
} catch (final Throwable e) { } catch (final Throwable e) {
@ -909,7 +848,6 @@ import java.util.concurrent.TimeUnit;
final int config_ver = 1; final int config_ver = 1;
config.set("version", config_ver); config.set("version", config_ver);
final Map<String, Object> options = new HashMap<>(); final Map<String, Object> options = new HashMap<>();
options.put("auto_update", false); options.put("auto_update", false);
options.put("claim.max-auto-area", Settings.MAX_AUTO_SIZE); options.put("claim.max-auto-area", Settings.MAX_AUTO_SIZE);
options.put("UUID.offline", Settings.OFFLINE_MODE); options.put("UUID.offline", Settings.OFFLINE_MODE);
@ -1317,15 +1255,6 @@ import java.util.concurrent.TimeUnit;
return plots; return plots;
} }
/**
* Set all plots
*
* @param plots New Plot LinkedHashMap
*/
public static void setAllPlotsRaw(final LinkedHashMap<String, HashMap<PlotId, Plot>> plots) {
PlotMain.plots = plots;
}
/** /**
* Set all plots * Set all plots
* *
@ -1336,6 +1265,15 @@ import java.util.concurrent.TimeUnit;
// PlotMain.plots.putAll(plots); // PlotMain.plots.putAll(plots);
} }
/**
* Set all plots
*
* @param plots New Plot LinkedHashMap
*/
public static void setAllPlotsRaw(final LinkedHashMap<String, HashMap<PlotId, Plot>> plots) {
PlotMain.plots = plots;
}
/** /**
* Get the PlotSquared World Generator * Get the PlotSquared World Generator
* *