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

fixed outpost being built instantly on output block place.

Browse Source 
cleaned up a bit
This commit is contained in:
NewGarbo 2016-01-07 14:03:15 +00:00
parent 5c810a46c9
commit d4fdda8ef2
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/outpost/Outpost.java
View File

@ -132,6 +132,11 @@ public class Outpost implements Listener
return; return;
} }
if (getLifetime() <= 2000)
{
return;
}
if (!_clan.equals(_clan.Clans.getClanUtility().getClanByPlayer(event.getPlayer()))) if (!_clan.equals(_clan.Clans.getClanUtility().getClanByPlayer(event.getPlayer())))
{ {
UtilPlayer.message(event.getPlayer(), F.main("Clans", "This is not yours to activate!")); UtilPlayer.message(event.getPlayer(), F.main("Clans", "This is not yours to activate!"));

1
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/outpost/OutpostManager.java
View File

@ -51,6 +51,7 @@ public class OutpostManager extends MiniPlugin
if (!Recharge.Instance.use(event.getPlayer(), "Place Outpost", 10000, true, false)) if (!Recharge.Instance.use(event.getPlayer(), "Place Outpost", 10000, true, false))
{ {
event.setCancelled(true); event.setCancelled(true);
return;
} }
if (Spawn(event.getPlayer(), event.getBlock().getLocation(), OutpostType.ORIGINAL_CLANS)) if (Spawn(event.getPlayer(), event.getBlock().getLocation(), OutpostType.ORIGINAL_CLANS))

4
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/LegendaryItem.java
View File

@ -7,10 +7,6 @@ import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType; import org.bukkit.potion.PotionEffectType;
import mineplex.core.common.util.C;
import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilServer;
import mineplex.core.common.util.UtilTextMiddle;
import mineplex.game.clans.items.CustomItem; import mineplex.game.clans.items.CustomItem;
import mineplex.game.clans.items.generation.ValueDistribution; import mineplex.game.clans.items.generation.ValueDistribution;
import mineplex.minecraft.game.core.damage.CustomDamageEvent; import mineplex.minecraft.game.core.damage.CustomDamageEvent;