Skip to content

Commit

Permalink
Fixes to ChunkLoad
Browse files Browse the repository at this point in the history
  • Loading branch information
GnomeffinWay committed Mar 23, 2013
1 parent 8bb215b commit b292221
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 16 deletions.
6 changes: 3 additions & 3 deletions src/main/java/net/aufdemrand/denizen/scripts/commands/CommandRegistry.java
View file
Expand Up @@ -64,7 +64,7 @@ public void registerCoreMembers() {
registerCoreMember(ChatCommand.class,
"CHAT", "chat [\"chat text\"] (npcid:#) (target(s):npc.#|player.name{attached player})", 1);

registerCoreMember(CooldownCommand.class,
registerCoreMember(ChunkLoadCommand.class,
"CHUNKLOAD", "chunkload ({add}|remove|removeall) [location:x,y,z,world] (duration:{-1s})", 1);

registerCoreMember(ClearCommand.class,
Expand All @@ -73,7 +73,7 @@ public void registerCoreMembers() {
registerCoreMember(CooldownCommand.class,
"COOLDOWN", "cooldown (duration:#{60s}) (global|player:name{attached player}) (script:name)", 1);

registerCoreMember(CooldownCommand.class,
registerCoreMember(CopyBlockCommand.class,
"COPYBLOCK", "copyblock [location:x,y,z,world] [to:x,y,z,world]", 1);

registerCoreMember(DetermineCommand.class,
Expand Down Expand Up @@ -109,7 +109,7 @@ public void registerCoreMembers() {
registerCoreMember(FinishCommand.class,
"FINISH", "finish (script:name{attached script}) (player:player_name)", 0);

registerCoreMember(FinishCommand.class,
registerCoreMember(FishCommand.class,
"FISH", "fish (stop) (location:x,y,z,world)", 1);

registerCoreMember(FlagCommand.class,
Expand Down
43 changes: 30 additions & 13 deletions src/main/java/net/aufdemrand/denizen/scripts/commands/core/ChunkLoadCommand.java
View file
Expand Up @@ -9,9 +9,9 @@
import net.aufdemrand.denizen.scripts.commands.AbstractCommand;
import net.aufdemrand.denizen.utilities.arguments.Duration;
import net.aufdemrand.denizen.utilities.arguments.aH;
import net.aufdemrand.denizen.utilities.arguments.aH.ArgumentType;
import net.aufdemrand.denizen.utilities.debugging.dB;
import net.aufdemrand.denizen.utilities.debugging.dB.Messages;
import net.citizensnpcs.api.event.NPCDespawnEvent;

import org.bukkit.Chunk;
import org.bukkit.event.EventHandler;
Expand All @@ -34,17 +34,18 @@ private enum Action { ADD, REMOVE, REMOVEALL }
@Override
public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
Chunk chunk = null;
Duration length = new Duration(-1);
Duration length = new Duration(0);
Action action = Action.ADD;

for (String arg : scriptEntry.getArguments()) {
if(aH.matchesArg("ADD, REMOVE, REMOVEALL", arg)) {
action = Action.valueOf(aH.getStringFrom(arg).toUpperCase());
} else if (aH.matchesValueArg("LOCATION", arg, ArgumentType.String)) {
} else if (aH.matchesLocation(arg)) {
chunk = aH.getLocationFrom(arg).getChunk();

} else if(aH.matchesInteger(arg) || aH.matchesDouble(arg) || aH.matchesDuration(arg))
} else if(aH.matchesInteger(arg) || aH.matchesDouble(arg) || aH.matchesDuration(arg)) {
length = Duration.valueOf(arg);
} else throw new InvalidArgumentsException(Messages.ERROR_UNKNOWN_ARGUMENT, arg);
}

if (chunk == null) throw new InvalidArgumentsException(Messages.DEBUG_SET_LOCATION);
Expand All @@ -64,13 +65,14 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {

switch (action) {
case ADD:
if(length.getSeconds() != -1)
chunkDelays.put(chunk, System.currentTimeMillis() + length.getMillis());
if(length.getSeconds() != 0)
chunkDelays.put(chunk.getX()+", "+chunk.getZ(), System.currentTimeMillis() + length.getMillis());
else
chunkDelays.put(chunk, (long) -1);
chunkDelays.put(chunk.getX()+", "+chunk.getZ(), (long) 0);
dB.echoDebug("...added chunk "+chunk.getX() + ", "+ chunk.getZ() + " with a " + length.getSeconds() + "delay");
if(!chunk.isLoaded())
chunk.load();
break;
case REMOVE:
if(chunkDelays.containsKey(chunk)) {
chunkDelays.remove(chunk);
Expand All @@ -84,25 +86,40 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
}

// Report to dB
dB.report(getName(), aH.debugObj("action", action.toString())
dB.report(getName(), aH.debugObj("Action", action.toString())
+ aH.debugObj("Chunk", chunk.toString())
+ aH.debugObj("Length", length.toString()));

}

// Map of chunks with delays
Map<Chunk, Long> chunkDelays = new HashMap<Chunk, Long>();
Map<String, Long> chunkDelays = new HashMap<String, Long>();

@EventHandler
public void stopUnload(ChunkUnloadEvent e) {
if(chunkDelays.containsKey(e.getChunk())) {
if(chunkDelays.get(e.getChunk()) == -1) {
if(chunkDelays.containsKey(e.getChunk().getX()+ ", "+e.getChunk().getZ())) {
if(chunkDelays.get(e.getChunk().getX()+ ", "+e.getChunk().getZ()) == 0) {
e.setCancelled(true);
return;
} else if(System.currentTimeMillis() < chunkDelays.get(e.getChunk().getX()+ ", "+e.getChunk().getZ())) {
e.setCancelled(true);
return;
} else chunkDelays.remove(e.getChunk().getX()+ ", "+e.getChunk().getZ());
}
return;
}

@EventHandler
public void stopDespawn(NPCDespawnEvent e) {
Chunk chnk = e.getNPC().getBukkitEntity().getLocation().getChunk();
if(chunkDelays.containsKey(chnk.getX() + ", "+chnk.getZ())) {
if(chunkDelays.get(chnk.getX() + ", "+chnk.getZ()) == 0) {
e.setCancelled(true);
return;
} else if(System.currentTimeMillis() < chunkDelays.get(e.getChunk())) {
} else if(System.currentTimeMillis() < chunkDelays.get(chnk.getX() + ", "+chnk.getZ())) {
e.setCancelled(true);
return;
} else chunkDelays.remove(e.getChunk());
} else chunkDelays.remove(chnk.getX() + ", "+chnk.getZ());
}
return;
}
Expand Down

0 comments on commit b292221

Please sign in to comment.