Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-11-20 02:45:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update for SpoutAPI scheduler and lighting changes

Browse Source
This commit is contained in:
zml2008 2012-05-26 11:34:26 -07:00
parent b22921ffa6
commit 379189f224
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/sk89q/worldedit/spout/SpoutServerInterface.java
View File

@ -31,6 +31,7 @@ import org.spout.api.Engine;
import org.spout.api.geo.World; import org.spout.api.geo.World;
import org.spout.api.material.Material; import org.spout.api.material.Material;
import org.spout.api.material.MaterialRegistry; import org.spout.api.material.MaterialRegistry;
import org.spout.api.scheduler.TaskPriority;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.ArrayList;
@ -74,7 +75,7 @@ public class SpoutServerInterface extends ServerInterface {
@Override @Override
public int schedule(long delay, long period, Runnable task) { public int schedule(long delay, long period, Runnable task) {
return game.getScheduler().scheduleSyncRepeatingTask(plugin, task, delay, period); return game.getScheduler().scheduleSyncRepeatingTask(plugin, task, delay * 50, period * 50, TaskPriority.NORMAL);
} }
@Override @Override

2
src/main/java/com/sk89q/worldedit/spout/SpoutWorld.java
View File

@ -192,7 +192,7 @@ public class SpoutWorld extends LocalWorld {
*/ */
@Override @Override
public int getBlockLightLevel(Vector pt) { public int getBlockLightLevel(Vector pt) {
return world.getBlockMaterial(pt.getBlockX(), pt.getBlockY(), pt.getBlockZ()).getLightLevel(); return world.getBlockLight(pt.getBlockX(), pt.getBlockY(), pt.getBlockZ());
} }
/** /**

3
src/main/java/com/sk89q/worldedit/spout/WorldEditListener.java
View File

@ -39,6 +39,7 @@ import org.spout.api.event.server.PreCommandEvent;
import org.spout.api.event.world.WorldLoadEvent; import org.spout.api.event.world.WorldLoadEvent;
import org.spout.api.generator.biome.BiomeGenerator; import org.spout.api.generator.biome.BiomeGenerator;
import org.spout.api.geo.discrete.Point; import org.spout.api.geo.discrete.Point;
import org.spout.api.scheduler.TaskPriority;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -140,7 +141,7 @@ public class WorldEditListener implements Listener {
public void run() { public void run() {
ignoreLeftClickAir = false; ignoreLeftClickAir = false;
} }
}, 2); }, 100, TaskPriority.NORMAL);
if (taskId != -1) { if (taskId != -1) {
ignoreLeftClickAir = true; ignoreLeftClickAir = true;

3
src/main/java/com/sk89q/worldedit/spout/WorldEditPlugin.java
View File

@ -36,6 +36,7 @@ import org.spout.api.command.CommandSource;
import org.spout.api.geo.World; import org.spout.api.geo.World;
import org.spout.api.player.Player; import org.spout.api.player.Player;
import org.spout.api.plugin.CommonPlugin; import org.spout.api.plugin.CommonPlugin;
import org.spout.api.scheduler.TaskPriority;
import org.spout.api.util.Named; import org.spout.api.util.Named;
import java.io.*; import java.io.*;
@ -100,7 +101,7 @@ public class WorldEditPlugin extends CommonPlugin implements Named {
registerEvents(); registerEvents();
getGame().getScheduler().scheduleAsyncRepeatingTask(this, getGame().getScheduler().scheduleAsyncRepeatingTask(this,
new SessionTimer(controller, getGame()), 120, 120); new SessionTimer(controller, getGame()), 6 * 1000, 6 * 1000, TaskPriority.LOWEST);
} }
/** /**