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

Fix some ssm bugs

This commit is contained in:
Sam 2018-01-31 11:33:18 +00:00 committed by Alexander Meech
parent 7e25edac45
commit 1f35045ea8
7 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
View File

@ -28,7 +28,6 @@ import org.bukkit.event.entity.ItemSpawnEvent;
import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.event.entity.PlayerDeathEvent;
import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.event.player.PlayerVelocityEvent;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
@ -551,18 +550,6 @@ public abstract class SuperSmash extends Game
} }
} }
@EventHandler(priority = EventPriority.HIGH)
public void velocity(PlayerVelocityEvent event)
{
Player player = event.getPlayer();
Long respawnTime = _respawnTime.get(player);
if (respawnTime != null && !UtilTime.elapsed(respawnTime, RESPAWN_INVUL))
{
event.setCancelled(true);
}
}
@EventHandler(priority = EventPriority.HIGH) @EventHandler(priority = EventPriority.HIGH)
public void arenaBoundry(CustomDamageEvent event) public void arenaBoundry(CustomDamageEvent event)
{ {
@ -583,7 +570,7 @@ public abstract class SuperSmash extends Game
entity.getWorld().strikeLightningEffect(entity.getLocation()); entity.getWorld().strikeLightningEffect(entity.getLocation());
} }
event.AddMod("Smash", "Super Smash Mobs", 5000, false); event.AddMod(GetName(), GetName(), 5000, false);
} }
} }

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/golem/PerkFissure.java
View File

@ -19,10 +19,12 @@ import mineplex.core.common.util.UtilPlayer;
import mineplex.core.recharge.Recharge; import mineplex.core.recharge.Recharge;
import mineplex.core.updater.UpdateType; import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent; import mineplex.core.updater.event.UpdateEvent;
import nautilus.game.arcade.game.games.smash.perks.SmashPerk;
import nautilus.game.arcade.kit.Perk; import nautilus.game.arcade.kit.Perk;
import nautilus.game.arcade.kit.perks.data.FissureData; import nautilus.game.arcade.kit.perks.data.FissureData;
public class PerkFissure extends Perk public class PerkFissure extends SmashPerk
{ {
private int _cooldown; private int _cooldown;

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/pig/PerkPigBaconBomb.java
View File

@ -190,7 +190,7 @@ public class PerkPigBaconBomb extends SmashPerk
{ {
if (player.equals(target) || isTeamDamage(player, target)) if (player.equals(target) || isTeamDamage(player, target))
{ {
return; continue;
} }
UtilEnt.CreatureMoveFast(pig, target.getLocation(), _pigSpeed); UtilEnt.CreatureMoveFast(pig, target.getLocation(), _pigSpeed);

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/villager/PerkArts.java
View File

@ -286,7 +286,7 @@ public class PerkArts extends SmashPerk
} }
else if (event.GetDamageePlayer() != null && isSuperActive(event.GetDamageePlayer())) else if (event.GetDamageePlayer() != null && isSuperActive(event.GetDamageePlayer()))
{ {
event.AddKnockback("Perfection", _defenseKBMod); event.GetKnockback().put(key, value + _defenseKBMod);
return; return;
} }

5
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/villager/SmashVillager.java
View File

@ -2,9 +2,11 @@ package nautilus.game.arcade.game.games.smash.perks.villager;
import org.bukkit.Sound; import org.bukkit.Sound;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.entity.Villager.Profession;
import mineplex.core.recharge.Recharge; import mineplex.core.recharge.Recharge;
import nautilus.game.arcade.game.games.smash.kits.KitVillager;
import nautilus.game.arcade.game.games.smash.kits.KitVillager.VillagerType; import nautilus.game.arcade.game.games.smash.kits.KitVillager.VillagerType;
import nautilus.game.arcade.game.games.smash.perks.SmashUltimate; import nautilus.game.arcade.game.games.smash.perks.SmashUltimate;
@ -25,6 +27,8 @@ public class SmashVillager extends SmashUltimate
{ {
Recharge.Instance.useForce(player, type.getName(), getLength()); Recharge.Instance.useForce(player, type.getName(), getLength());
} }
((KitVillager) Kit).updateDisguise(player, Profession.PRIEST);
} }
@Override @Override
@ -33,5 +37,6 @@ public class SmashVillager extends SmashUltimate
super.cancel(player); super.cancel(player);
player.setWalkSpeed(0.2F); player.setWalkSpeed(0.2F);
((KitVillager) Kit).updateDisguise(player, Profession.FARMER);
} }
} }

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/witherskeleton/PerkWitherSkull.java
View File

@ -18,6 +18,7 @@ import org.bukkit.util.Vector;
import mineplex.core.common.util.C; import mineplex.core.common.util.C;
import mineplex.core.common.util.F; import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilAlg;
import mineplex.core.common.util.UtilBlock; import mineplex.core.common.util.UtilBlock;
import mineplex.core.common.util.UtilEnt; import mineplex.core.common.util.UtilEnt;
import mineplex.core.common.util.UtilEvent; import mineplex.core.common.util.UtilEvent;
@ -125,6 +126,7 @@ public class PerkWitherSkull extends SmashPerk
} }
Location newLocation = skullHolder.getLocation().add(skullData.Direction.clone().multiply(1.6)); Location newLocation = skullHolder.getLocation().add(skullData.Direction.clone().multiply(1.6));
newLocation.setYaw(UtilAlg.GetYaw(skullData.Direction));
skullHolder.teleport(newLocation); skullHolder.teleport(newLocation);
UtilParticle.PlayParticleToAll(ParticleType.SMOKE, newLocation.add(0, 2, 0), null, 0.01F, 2, ViewDist.LONG); UtilParticle.PlayParticleToAll(ParticleType.SMOKE, newLocation.add(0, 2, 0), null, 0.01F, 2, ViewDist.LONG);

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/data/FissureData.java
View File

@ -167,7 +167,7 @@ public class FissureData
} }
if(Host.Manager.GetGame() instanceof TeamSuperSmash && Host.Manager.GetGame().GetTeam(_player).GetPlayers(true).contains(cur)) if(Host.isTeamDamage(_player, cur))
{ {
continue; continue;
} }