JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed CCM in WarPointEvasion.

Browse Source 
Removed debug message; NOT RIDER
This commit is contained in:
Jonathan Williams 2016-04-04 13:46:39 -05:00
parent e2baf2b56c
commit a91ef68978
2 changed files with 49 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/SiegeWeapon.java
View File

@ -758,7 +758,6 @@ public abstract class SiegeWeapon implements Listener
{
if (!event.getPlayer().equals(_rider))
{
System.out.println("NOT RIDER");
return;
}

73
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/warpoints/WarPointEvasion.java
View File

@ -3,8 +3,6 @@ package mineplex.game.clans.clans.warpoints;
import com.google.common.collect.Maps;
import mineplex.core.MiniPlugin;
import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilServer;
import mineplex.core.common.util.UtilTime;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
@ -12,75 +10,102 @@ import mineplex.game.clans.clans.ClansManager;
import mineplex.game.clans.clans.event.*;
import org.bukkit.Bukkit;
import org.bukkit.Chunk;
import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.plugin.java.JavaPlugin;
import java.util.HashMap;
import java.util.Iterator;
import java.util.UUID;
public class WarPointEvasion extends MiniPlugin{
public class WarPointEvasion extends MiniPlugin
{
private HashMap<Chunk, Long> _chunkCooldown;
private HashMap<UUID, Long> _playerCooldown;
private final long COOLDOWN_TIME = 1000 * 60 * 10;
public WarPointEvasion(JavaPlugin plugin) {
public WarPointEvasion(JavaPlugin plugin)
{
super("WP Evasion", plugin);
_chunkCooldown = Maps.newHashMap();
_playerCooldown = Maps.newHashMap();
}
@EventHandler
public void updateCooldown(UpdateEvent event) {
public void updateCooldown(UpdateEvent event)
{
if(!event.getType().equals(UpdateType.SEC)) return;
_chunkCooldown.keySet().stream().filter(chunk -> UtilTime.elapsed(_chunkCooldown.get(chunk), COOLDOWN_TIME)).forEach(chunk -> _chunkCooldown.remove(chunk));
for (Iterator<Chunk> chunkIterator = _chunkCooldown.keySet().iterator(); chunkIterator.hasNext();)
{
Chunk chunk = chunkIterator.next();
if (UtilTime.elapsed(_chunkCooldown.get(chunk), COOLDOWN_TIME))
chunkIterator.remove();
}
_playerCooldown.keySet().stream().filter(player -> UtilTime.elapsed(_playerCooldown.get(player), COOLDOWN_TIME)).forEach(player -> {
_playerCooldown.remove(player);
if(Bukkit.getOfflinePlayer(player).isOnline()) {
if(ClansManager.getInstance().getClan(Bukkit.getPlayer(player)) == null) {
Bukkit.getPlayer(player).sendMessage(F.main("Clans", "You can now create a clan."));
for (Iterator<UUID> uuidIterator = _playerCooldown.keySet().iterator(); uuidIterator.hasNext();)
{
UUID uuid = uuidIterator.next();
if (UtilTime.elapsed(_playerCooldown.get(uuid), COOLDOWN_TIME))
{
uuidIterator.remove();
Player player = Bukkit.getPlayer(uuid);
if (player.isOnline())
{
if(ClansManager.getInstance().getClan(player) == null)
{
player.sendMessage(F.main("Clans", "You can now create a clan."));
}
}
}
});
}
}
}
@EventHandler
public void onClaim(PlayerPreClaimTerritoryEvent event) {
public void onClaim(PlayerPreClaimTerritoryEvent event)
{
Chunk chunk = event.getClaimedChunk();
if(_chunkCooldown.containsKey(chunk)) {
if(_chunkCooldown.containsKey(chunk))
{
event.setCancelled(true);
event.getClaimer().sendMessage(F.main("Clans", "You cannot claim this chunk for another " + UtilTime.convertString(COOLDOWN_TIME - (System.currentTimeMillis() - _chunkCooldown.get(chunk)), 1, UtilTime.TimeUnit.MINUTES)));
}
}
@EventHandler
public void onunClaim(PlayerUnClaimTerritoryEvent event) {
Chunk chunk = event.getUnClaimedChunk();
_chunkCooldown.put(chunk, System.currentTimeMillis());
public void onunClaim(PlayerUnClaimTerritoryEvent event)
{
_chunkCooldown.put(event.getUnClaimedChunk(), System.currentTimeMillis());
}
@EventHandler
public void onClanDisband(ClanDisbandedEvent event) {
public void onClanDisband(ClanDisbandedEvent event)
{
_playerCooldown.put(event.getDisbander().getUniqueId(), System.currentTimeMillis());
}
@EventHandler
public void onClanLeave(ClanLeaveEvent event) {
public void onClanLeave(ClanLeaveEvent event)
{
_playerCooldown.put(event.getPlayer().getUuid(), System.currentTimeMillis());
}
@EventHandler
public void onClanCreate(ClanCreatedEvent event) {
public void onClanCreate(ClanCreatedEvent event)
{
if (event.getFounder() == null)
return;
if (_playerCooldown.containsKey(event.getFounder().getUniqueId())) {
if (_playerCooldown.containsKey(event.getFounder().getUniqueId()))
{
event.setCancelled(true);
event.getFounder().sendMessage(F.main("Clans", "You cannot create a clan for another " + UtilTime.convertString(COOLDOWN_TIME - (System.currentTimeMillis() - _playerCooldown.get(event.getFounder().getUniqueId())), 1, UtilTime.TimeUnit.MINUTES)));
}