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

Fixes merging bugs

Browse Source
This commit is contained in:
LCastr0 2016-05-20 23:53:27 -03:00
commit 92b6abc884
5 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plugins/Mineplex.Core/src/mineplex/core/gadget/commands/LockCosmeticsCommand.java
View File

@ -23,12 +23,12 @@ public class LockCosmeticsCommand extends CommandBase<GadgetManager>
@Override @Override
public void Execute(Player caller, String[] args) public void Execute(Player caller, String[] args)
{ {
// Adds all cosmetic types // Removes all cosmetic types
if (args.length == 0) if (args.length == 0)
{ {
addCosmetics(null, caller); addCosmetics(null, caller);
} }
// Adds specific type // Removes specific type
else else
{ {
String type = args[0]; String type = args[0];

10
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java
View File

@ -1311,12 +1311,12 @@ public class Bridge extends TeamGame implements OreObsfucation
return; return;
List<ItemStack> drops = new ArrayList<ItemStack>(); List<ItemStack> drops = new ArrayList<ItemStack>();
for (Material mat : PLAYER_DROP_DELAY_MATERIALS) for (Material mat : PLAYER_DROP_DELAY_MATERIALS)
{ {
if (event.getBlock().getType() == mat) if (event.getBlock().getType() == mat)
{ {
drops.addAll(event.getBlock().getDrops()); drops.addAll(event.getBlock().getDrops(event.getPlayer().getItemInHand()));
break; break;
} }
} }
@ -1327,12 +1327,6 @@ public class Bridge extends TeamGame implements OreObsfucation
event.setCancelled(true); event.setCancelled(true);
event.getBlock().setType(Material.AIR); event.getBlock().setType(Material.AIR);
if (event.getBlock().getType() == Material.FURNACE || UtilItem.isOre(event.getBlock().getType())) // Can't be broken by fist
{
if (event.getPlayer().getItemInHand() == null || !CraftItemStack.asNMSCopy(event.getPlayer().getItemInHand()).b(CraftMagicNumbers.getBlock((CraftBlock) event.getBlock())))
return;
}
Location loc = event.getBlock().getLocation().clone().add(.5, .5, .5); Location loc = event.getBlock().getLocation().clone().add(.5, .5, .5);
for (ItemStack item : drops) for (ItemStack item : drops)

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java
View File

@ -180,8 +180,6 @@ public class Build extends SoloGame
this.WorldTimeSet = 6000; this.WorldTimeSet = 6000;
this.PrepareFreeze = false;
this.CreatureAllow = true; this.CreatureAllow = true;
this.WorldFireSpread = true; this.WorldFireSpread = true;

20
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java
View File

@ -713,7 +713,16 @@ public class TurfForts extends TeamGame
{ {
if (((CraftPlayer) player).getHandle().spectating) if (((CraftPlayer) player).getHandle().spectating)
continue; continue;
//Slow
if (_enemyTurf.containsKey(player))
{
int time = (int) ((System.currentTimeMillis() - _enemyTurf.get(player)) / 2500);
if (time > 0)
Manager.GetCondition().Factory().Slow("Infiltrator Slow", player, player, 0.9, time - 1, false, false, false, false);
}
Block block = player.getLocation().getBlock().getRelative(BlockFace.DOWN); Block block = player.getLocation().getBlock().getRelative(BlockFace.DOWN);
// Apply velocity even if the player is sneaking near turf edges. // Apply velocity even if the player is sneaking near turf edges.
@ -749,15 +758,6 @@ public class TurfForts extends TeamGame
byte data = block.getData(); byte data = block.getData();
//Slow
if (_enemyTurf.containsKey(player))
{
int time = (int) ((System.currentTimeMillis() - _enemyTurf.get(player)) / 2500);
if (time > 0)
Manager.GetCondition().Factory().Slow("Infiltrator Slow", player, player, 0.9, time - 1, false, false, false, false);
}
//On Enemy Turf //On Enemy Turf
if ((team.GetColor() == ChatColor.RED && data == 3) || (team.GetColor() == ChatColor.AQUA && data == 14)) if ((team.GetColor() == ChatColor.RED && data == 3) || (team.GetColor() == ChatColor.AQUA && data == 14))
{ {

6
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
View File

@ -14,6 +14,7 @@ import mineplex.core.common.util.UtilTextBottom;
import mineplex.core.common.util.UtilTime; import mineplex.core.common.util.UtilTime;
import mineplex.core.game.GameCategory; import mineplex.core.game.GameCategory;
import mineplex.core.itemstack.ItemStackFactory; import mineplex.core.itemstack.ItemStackFactory;
import mineplex.core.punish.PunishClient;
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.ArcadeManager; import nautilus.game.arcade.ArcadeManager;
@ -414,6 +415,11 @@ public class GameHostManager implements Listener
return; return;
} }
if (Manager.getPunishments().GetClient(event.getPlayer().getName()).IsMuted())
{
return;
}
String msg = ""; String msg = "";
for (int i = 1; i < event.getMessage().split(" ").length; i++) for (int i = 1; i < event.getMessage().split(" ").length; i++)
{ {