craftinc/craftinc-gates
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Made chunk load listener handle multiple teleport requests with the same destination chunk.

Browse Source
This commit is contained in:
Tobias Ottenweller 2013-06-01 11:32:18 +02:00
parent 093778f2fb
commit e6e6273147
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/de/craftinc/gates/listeners/ChunkLoadListener.java
View File

@ -10,36 +10,54 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.world.ChunkLoadEvent; import org.bukkit.event.world.ChunkLoadEvent;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
public class ChunkLoadListener implements Listener public class ChunkLoadListener implements Listener
{ {
private HashMap<Chunk, TeleportRequest> pendingRequests = new HashMap<Chunk, TeleportRequest>(); private HashMap<Chunk, List<TeleportRequest>> pendingRequests = new HashMap<Chunk, List<TeleportRequest>>();
@EventHandler(priority = EventPriority.NORMAL) @EventHandler(priority = EventPriority.NORMAL)
public void onChunkLoad(ChunkLoadEvent event) public void onChunkLoad(ChunkLoadEvent event)
{ {
Chunk c = event.getChunk(); Chunk c = event.getChunk();
TeleportRequest request = pendingRequests.get(c); List<TeleportRequest> requests = pendingRequests.get(c);
if (request != null) { if (requests != null) {
pendingRequests.remove(c); pendingRequests.remove(c);
Player p = request.getPlayer(); for (TeleportRequest r : requests) {
p.teleport(request.getDestination());
Player p = r.getPlayer();
p.sendMessage(ChatColor.DARK_AQUA + "Chunk got loaded.");
p.teleport(r.getDestination());
p.sendMessage(ChatColor.DARK_AQUA + "Thank you for traveling with Craft Inc. Gates."); p.sendMessage(ChatColor.DARK_AQUA + "Thank you for traveling with Craft Inc. Gates.");
} }
} }
}
public void addTeleportRequest(TeleportRequest request) public void addTeleportRequest(final TeleportRequest r)
{ {
if (request == null) { if (r == null) {
throw new IllegalArgumentException("The request must not be null!"); throw new IllegalArgumentException("The request must not be null!");
} }
this.pendingRequests.put(request.getDestination().getChunk(), request); Chunk c = r.getDestination().getChunk();
List<TeleportRequest> requests = pendingRequests.get(c);
if (requests == null) {
requests = new ArrayList<TeleportRequest>();
this.pendingRequests.put(c, requests);
}
requests.add(r);
} }
} }