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

fixed some skill bugs

Browse Source 
players quitting during recruit will no longer remain on a team, caused unbalance
GiveClock flag added to game, to stop giving clock.
This commit is contained in:
Chiss 2014-04-20 13:50:15 +10:00
parent de2b42e190
commit 845d45bd4d
5 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/IcePrison.java
View File

@ -11,7 +11,9 @@ import org.bukkit.block.BlockFace;
import org.bukkit.entity.Item;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.block.Action;
import org.bukkit.event.block.BlockFadeEvent;
import mineplex.minecraft.game.classcombat.Class.IPvpClass.ClassType;
import mineplex.core.common.util.F;
@ -155,7 +157,13 @@ public class IcePrison extends SkillActive implements IThrown
Factory.BlockRestore().Add(freeze, 79, (byte)0, time);
freeze.getWorld().playEffect(freeze.getLocation(), Effect.STEP_SOUND, 79);
}
@EventHandler
public void BlockFade(BlockFadeEvent event)
{
if (event.getBlock().getType() == Material.ICE)
event.setCancelled(true);
}
@Override
public void Reset(Player player)

2
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/LightningOrb.java
View File

@ -45,7 +45,7 @@ public class LightningOrb extends SkillActive implements IThrown
{
"Launch a lightning orb. Upon a direct",
"hit with player, or #5#-0.4 seconds, it will",
"strike all enemies with #3#0.5 Blocks ",
"strike all enemies within #3#0.5 Blocks ",
"with lightning, giving them Slow 3",
"for #2#1 seconds."
});

3
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
View File

@ -458,6 +458,9 @@ public class ArcadeManager extends MiniPlugin implements IRelation
public void HubClock(Player player)
{
if (_game != null && !_game.GiveClock)
return;
player.getInventory().setItem(8, ItemStackFactory.Instance.CreateStack(Material.WATCH, (byte)0, 1, (short)0, C.cGreen + "Return to Hub",
new String[] {"", ChatColor.RESET + "Click while holding this", ChatColor.RESET + "to return to the Hub."}));
}

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
View File

@ -176,6 +176,8 @@ public abstract class Game implements Listener
//Addons
public boolean CompassEnabled = false;
public boolean SoupEnabled = true;
public boolean GiveClock = true;
public double GemMultiplier = 1;
@ -1028,6 +1030,4 @@ public abstract class Game implements Listener
{
return _prepareCountdown;
}
}

8
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java
View File

@ -636,7 +636,13 @@ public class GameFlagManager implements Listener
GameTeam team = game.GetTeam(event.getPlayer());
if (team != null)
team.SetPlayerState(event.getPlayer(), PlayerState.OUT);
{
if (game.InProgress())
team.SetPlayerState(event.getPlayer(), PlayerState.OUT);
else
team.RemovePlayer(event.getPlayer());
}
}
@EventHandler