From 11fb02a5943144bec775db9abc1f8cf361833f64 Mon Sep 17 00:00:00 2001 From: fooify Date: Tue, 30 Jun 2015 09:03:43 -0700 Subject: [PATCH 01/22] add stained glass to list of blocks that can be broken in quiver --- .../src/nautilus/game/arcade/game/games/quiver/Quiver.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/Quiver.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/Quiver.java index bbd123b34..6a364cca3 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/Quiver.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/Quiver.java @@ -75,6 +75,8 @@ public class Quiver extends SoloGame this.SpawnDistanceRequirement = 16; this.BlockBreakAllow.add(102); this.BlockBreakAllow.add(20); + this.BlockBreakAllow.add(Material.STAINED_GLASS_PANE.getId()); + this.BlockBreakAllow.add(Material.STAINED_GLASS.getId()); _scoreObj = Scoreboard.GetScoreboard().registerNewObjective("Kills", "dummy"); _scoreObj.setDisplaySlot(DisplaySlot.BELOW_NAME); From d2cc8d507794a9175aaca77266f7b40faa1e70a2 Mon Sep 17 00:00:00 2001 From: fooify Date: Tue, 30 Jun 2015 09:19:21 -0700 Subject: [PATCH 02/22] fix grammar bug --- .../game/arcade/game/games/minestrike/MineStrike.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java index b1900ffd7..3d38fad83 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java @@ -1868,7 +1868,11 @@ public class MineStrike extends TeamGame ChatColor color = ChatColor.GRAY; if (winner != null) { - winnerLine= winner.GetColor() + C.Bold + winner.GetName() + " has won the round!"; + if(winner.GetName().contains("Bombers")) { + winnerLine= winner.GetColor() + C.Bold + winner.GetName() + " have won the round!"; + } else { + winnerLine= winner.GetColor() + C.Bold + winner.GetName() + " has won the round!"; + } addScore(winner); drawScoreboard(); color = winner.GetColor(); From c824a39058c98ce0f765d7fb1334bf0c2115bc8c Mon Sep 17 00:00:00 2001 From: fooify Date: Tue, 30 Jun 2015 13:33:41 -0700 Subject: [PATCH 03/22] ishh wanted it...k --- .../src/mineplex/core/message/MessageManager.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java b/Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java index b81e7fbb1..34956ecda 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java @@ -224,6 +224,11 @@ public class MessageManager extends MiniClientPlugin UtilPlayer.message(from, C.cPurple + to.getName() + " is often AFK or minimized, due to plugin development."); UtilPlayer.message(from, C.cPurple + "Please be patient if he does not reply instantly."); } + + if(to.getName().equals("ishh")) + { + UtilPlayer.message(from, C.cPurple + "Hi, my name is ishh. If I don't respond to your message, please be patient and try again later!"); + } // Log // Logger().logChat("Private Message", from, to.getName(), message); From b9b9c5f80164c4b0e3f3608102bd97725700cd72 Mon Sep 17 00:00:00 2001 From: fooify Date: Tue, 30 Jun 2015 13:37:46 -0700 Subject: [PATCH 04/22] ishh also wanted this :P (let me know if I should remove it) --- .../src/mineplex/core/stats/command/GiveStatCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/stats/command/GiveStatCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/stats/command/GiveStatCommand.java index 35293a2b5..b718505d0 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/stats/command/GiveStatCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/stats/command/GiveStatCommand.java @@ -13,7 +13,7 @@ public class GiveStatCommand extends CommandBase { public GiveStatCommand(StatsManager plugin) { - super(plugin, Rank.OWNER, "givestat"); + super(plugin, Rank.ADMIN, "givestat"); } @Override From 6d42be4d139e04c0db513ab15b58a5f1828357c9 Mon Sep 17 00:00:00 2001 From: fooify Date: Wed, 1 Jul 2015 07:17:41 -0700 Subject: [PATCH 05/22] fix spleef lava issue --- .../src/nautilus/game/arcade/game/games/spleef/Spleef.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/Spleef.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/Spleef.java index 6716ac290..dcfcfa9e1 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/Spleef.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/Spleef.java @@ -182,7 +182,7 @@ public class Spleef extends SoloGame public void BlockFade(Block block, Player player, boolean slowDamage) { - if (block.getTypeId() == 7) + if (block.getType() == Material.BEDROCK || block.getType() == Material.LAVA || block.getType() == Material.STATIONARY_LAVA) return; //Prevent Super Hunger from Bow From 6dc7384c8215468af115632f8c137c3bba27d3d0 Mon Sep 17 00:00:00 2001 From: fooify Date: Wed, 1 Jul 2015 08:16:14 -0700 Subject: [PATCH 06/22] fix creeper smash exploding lava and bedrock --- .../arcade/kit/perks/PerkCreeperExplode.java | 38 +++++++++++-------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkCreeperExplode.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkCreeperExplode.java index 4e1c99624..9a7c2b172 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkCreeperExplode.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkCreeperExplode.java @@ -1,40 +1,42 @@ package nautilus.game.arcade.kit.perks; +import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; -import org.bukkit.Location; -import org.bukkit.Sound; -import org.bukkit.entity.Entity; -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.entity.PlayerDeathEvent; -import org.bukkit.event.entity.EntityDamageEvent.DamageCause; -import org.bukkit.event.player.PlayerInteractEvent; -import org.bukkit.util.Vector; - import mineplex.core.common.util.C; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilAction; import mineplex.core.common.util.UtilBlock; import mineplex.core.common.util.UtilMath; import mineplex.core.common.util.UtilParticle; -import mineplex.core.common.util.UtilPlayer; -import mineplex.core.common.util.UtilServer; import mineplex.core.common.util.UtilParticle.ParticleType; import mineplex.core.common.util.UtilParticle.ViewDist; +import mineplex.core.common.util.UtilPlayer; +import mineplex.core.common.util.UtilServer; import mineplex.core.disguise.disguises.DisguiseBase; import mineplex.core.disguise.disguises.DisguiseCreeper; import mineplex.core.recharge.Recharge; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; import mineplex.minecraft.game.core.damage.CustomDamageEvent; -import nautilus.game.arcade.kit.Perk; import nautilus.game.arcade.kit.SmashPerk; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.Sound; +import org.bukkit.block.Block; +import org.bukkit.entity.Entity; +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.entity.EntityDamageEvent.DamageCause; +import org.bukkit.event.entity.PlayerDeathEvent; +import org.bukkit.event.player.PlayerInteractEvent; +import org.bukkit.util.Vector; + public class PerkCreeperExplode extends SmashPerk { private HashMap _active = new HashMap(); @@ -144,7 +146,11 @@ public class PerkCreeperExplode extends SmashPerk player.getWorld().playSound(player.getLocation(), Sound.EXPLODE, (float)(2 + Math.random()*4), (float)(Math.random() + 0.2)); //Blocks - Manager.GetExplosion().BlockExplosion(UtilBlock.getInRadius(player.getLocation(), 12).keySet(), player.getLocation(), false); + Collection blocks = UtilBlock.getInRadius(player.getLocation(), 12).keySet(); + for(Block bl : blocks) + if(bl.getType() == Material.LAVA || bl.getType() == Material.BEDROCK) blocks.remove(bl); + + Manager.GetExplosion().BlockExplosion(blocks, player.getLocation(), false); //Remove Spawns Iterator spawnIterator = Manager.GetGame().GetTeam(player).GetSpawns().iterator(); From b7476cec5ed957e7ea0f1a746c2d408693fc3eab Mon Sep 17 00:00:00 2001 From: fooify Date: Wed, 1 Jul 2015 08:25:17 -0700 Subject: [PATCH 07/22] prevent STATIONARY_LAVA from breaking in creeper smash --- .../src/nautilus/game/arcade/kit/perks/PerkCreeperExplode.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkCreeperExplode.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkCreeperExplode.java index 9a7c2b172..0fe298495 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkCreeperExplode.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkCreeperExplode.java @@ -148,7 +148,7 @@ public class PerkCreeperExplode extends SmashPerk //Blocks Collection blocks = UtilBlock.getInRadius(player.getLocation(), 12).keySet(); for(Block bl : blocks) - if(bl.getType() == Material.LAVA || bl.getType() == Material.BEDROCK) blocks.remove(bl); + if(bl.getType() == Material.STATIONARY_LAVA || bl.getType() == Material.LAVA || bl.getType() == Material.BEDROCK) blocks.remove(bl); Manager.GetExplosion().BlockExplosion(blocks, player.getLocation(), false); From 8574c0bdeb793cb9a5de7079341cf4598190bdf6 Mon Sep 17 00:00:00 2001 From: fooify Date: Wed, 1 Jul 2015 09:58:45 -0700 Subject: [PATCH 08/22] fix turfforts bug --- .../game/games/turfforts/TurfForts.java | 58 +++++++++++-------- 1 file changed, 34 insertions(+), 24 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java index 87efca5ee..a250c4f7f 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java @@ -4,30 +4,6 @@ import java.lang.reflect.Field; import java.util.ArrayList; import java.util.HashMap; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.Effect; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.Sound; -import org.bukkit.block.Block; -import org.bukkit.block.BlockFace; -import org.bukkit.craftbukkit.v1_7_R4.entity.CraftArrow; -import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer; -import org.bukkit.entity.Arrow; -import org.bukkit.entity.Entity; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.HandlerList; -import org.bukkit.event.block.BlockEvent; -import org.bukkit.event.block.BlockPlaceEvent; -import org.bukkit.event.entity.EntityDamageEvent.DamageCause; -import org.bukkit.event.entity.EntityShootBowEvent; -import org.bukkit.event.entity.PlayerDeathEvent; -import org.bukkit.event.entity.ProjectileHitEvent; - -import net.minecraft.server.v1_7_R4.EntityArrow; -import net.minecraft.server.v1_7_R4.Item; import mineplex.core.common.util.C; import mineplex.core.common.util.F; import mineplex.core.common.util.MapUtil; @@ -54,6 +30,31 @@ import nautilus.game.arcade.kit.Kit; import nautilus.game.arcade.stats.BehindEnemyLinesStatTracker; import nautilus.game.arcade.stats.BlockShreadStatTracker; import nautilus.game.arcade.stats.TheComebackStatTracker; +import net.minecraft.server.v1_7_R4.EntityArrow; +import net.minecraft.server.v1_7_R4.Item; + +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.Effect; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.Sound; +import org.bukkit.block.Block; +import org.bukkit.block.BlockFace; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftArrow; +import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer; +import org.bukkit.entity.Arrow; +import org.bukkit.entity.Entity; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.HandlerList; +import org.bukkit.event.block.BlockBreakEvent; +import org.bukkit.event.block.BlockEvent; +import org.bukkit.event.block.BlockPlaceEvent; +import org.bukkit.event.entity.EntityDamageEvent.DamageCause; +import org.bukkit.event.entity.EntityShootBowEvent; +import org.bukkit.event.entity.PlayerDeathEvent; +import org.bukkit.event.entity.ProjectileHitEvent; public class TurfForts extends TeamGame { @@ -281,6 +282,15 @@ public class TurfForts extends TeamGame } } + @EventHandler + public void BlockBreak(BlockBreakEvent event) + { + if (event.isCancelled()) // this statement might save just a small amount of time + return; + + if(getArcadeManager().isSpectator(event.getPlayer())) event.setCancelled(true); + } + @EventHandler public void BlockPlace(BlockPlaceEvent event) { From 4495468c7f905539979a18f852210686ba873dcd Mon Sep 17 00:00:00 2001 From: fooify Date: Wed, 1 Jul 2015 15:50:07 -0700 Subject: [PATCH 09/22] fix concurrentmodificationexception --- .../game/arcade/kit/perks/PerkCreeperExplode.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkCreeperExplode.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkCreeperExplode.java index 0fe298495..6498ec8d8 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkCreeperExplode.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkCreeperExplode.java @@ -147,9 +147,11 @@ public class PerkCreeperExplode extends SmashPerk //Blocks Collection blocks = UtilBlock.getInRadius(player.getLocation(), 12).keySet(); - for(Block bl : blocks) - if(bl.getType() == Material.STATIONARY_LAVA || bl.getType() == Material.LAVA || bl.getType() == Material.BEDROCK) blocks.remove(bl); - + synchronized(blocks) + { + for(Block bl : blocks) + if(bl.getType() == Material.STATIONARY_LAVA || bl.getType() == Material.LAVA || bl.getType() == Material.BEDROCK) blocks.remove(bl); + } Manager.GetExplosion().BlockExplosion(blocks, player.getLocation(), false); //Remove Spawns From 04c863c0eb521d0d9d000530c2ad9b3c4c86f826 Mon Sep 17 00:00:00 2001 From: fooify Date: Wed, 1 Jul 2015 16:10:41 -0700 Subject: [PATCH 10/22] FOOIFY IS A NOOB OKAY --- .../game/arcade/kit/perks/PerkCreeperExplode.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkCreeperExplode.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkCreeperExplode.java index 6498ec8d8..40beca013 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkCreeperExplode.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkCreeperExplode.java @@ -147,10 +147,12 @@ public class PerkCreeperExplode extends SmashPerk //Blocks Collection blocks = UtilBlock.getInRadius(player.getLocation(), 12).keySet(); - synchronized(blocks) - { - for(Block bl : blocks) - if(bl.getType() == Material.STATIONARY_LAVA || bl.getType() == Material.LAVA || bl.getType() == Material.BEDROCK) blocks.remove(bl); + Iterator iter = blocks.iterator(); + + while (iter.hasNext()) { + Block b = iter.next(); + + if(b.getType() == Material.STATIONARY_LAVA || b.getType() == Material.LAVA || b.getType() == Material.BEDROCK) blocks.remove(b); } Manager.GetExplosion().BlockExplosion(blocks, player.getLocation(), false); From d1e43066842895aa6f46d1e2b825d693f770a5e0 Mon Sep 17 00:00:00 2001 From: fooify Date: Wed, 1 Jul 2015 16:38:10 -0700 Subject: [PATCH 11/22] fix this agaaaaain --- .../src/nautilus/game/arcade/kit/perks/PerkCreeperExplode.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkCreeperExplode.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkCreeperExplode.java index 40beca013..318017f71 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkCreeperExplode.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkCreeperExplode.java @@ -152,7 +152,7 @@ public class PerkCreeperExplode extends SmashPerk while (iter.hasNext()) { Block b = iter.next(); - if(b.getType() == Material.STATIONARY_LAVA || b.getType() == Material.LAVA || b.getType() == Material.BEDROCK) blocks.remove(b); + if(b.getType() == Material.STATIONARY_LAVA || b.getType() == Material.LAVA || b.getType() == Material.BEDROCK) iter.remove();; } Manager.GetExplosion().BlockExplosion(blocks, player.getLocation(), false); From e7b51ac1c12521bbd6ca4054f308cfe5ac38552a Mon Sep 17 00:00:00 2001 From: fooify Date: Wed, 1 Jul 2015 16:40:15 -0700 Subject: [PATCH 12/22] add jnr_dev to updaterank --- .../src/mineplex/core/account/command/UpdateRank.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java b/Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java index 8a7efe8fe..b6a6a251b 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java @@ -52,7 +52,7 @@ public class UpdateRank extends CommandBase final Rank rank = tempRank; - if (rank == Rank.ADMIN || rank == Rank.YOUTUBE || rank == Rank.TWITCH || rank == Rank.MODERATOR || rank == Rank.HELPER || rank == Rank.ALL || rank == Rank.MAPDEV || rank == Rank.SNR_MODERATOR) + if (rank == Rank.ADMIN || rank == Rank.YOUTUBE || rank == Rank.TWITCH || rank == Rank.MODERATOR || rank == Rank.JNR_DEV || rank == Rank.HELPER || rank == Rank.ALL || rank == Rank.MAPDEV || rank == Rank.SNR_MODERATOR) { if (rank == Rank.ADMIN && !Plugin.hasRank(caller, Rank.LT)) { From 70d351adaea275b3b9af5c33dc9e0e26a57feeb9 Mon Sep 17 00:00:00 2001 From: fooify Date: Wed, 1 Jul 2015 16:58:16 -0700 Subject: [PATCH 13/22] fix getting snowballs from bedrock --- .../src/nautilus/game/arcade/game/games/spleef/Spleef.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/Spleef.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/Spleef.java index dcfcfa9e1..a18493971 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/Spleef.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/Spleef.java @@ -175,7 +175,7 @@ public class Spleef extends SoloGame BlockFade(event.getBlock(), event.getPlayer(), false); //Snowball - if (GetKit(event.getPlayer()) instanceof KitSnowballer) + if (GetKit(event.getPlayer()) instanceof KitSnowballer && event.getBlock().getType() != Material.BEDROCK) if (!UtilInv.contains(event.getPlayer(), Material.SNOW_BALL, (byte)0, 16)) event.getPlayer().getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.SNOW_BALL)); } From 5d34716521dc4795b3fbfeb6d3447d7b579f3da6 Mon Sep 17 00:00:00 2001 From: fooify Date: Wed, 8 Jul 2015 06:20:40 -0700 Subject: [PATCH 14/22] squirrel! --- .../src/mineplex/core/achievement/AchievementManager.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java b/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java index 4fe166860..f0d47baed 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java @@ -212,6 +212,8 @@ public class AchievementManager extends MiniPlugin level = -level; else if (sender.getName().equalsIgnoreCase("B2_mp")) return 101; + else if (sender.getName().equalsIgnoreCase("fooify")) + level = 404; else if (rank.Has(Rank.OWNER)) level = Math.max(level, 50 + get(sender, Achievement.GLOBAL_GEM_HUNTER).getLevel()); else if (rank.Has(Rank.ADMIN)) From 5d820edd41988402f7fb7c107d62c7544c62e51e Mon Sep 17 00:00:00 2001 From: fooify Date: Wed, 15 Jul 2015 14:34:42 -0700 Subject: [PATCH 15/22] remove custom level to fix merge conflicts --- .../src/mineplex/core/achievement/AchievementManager.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java b/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java index f0d47baed..4fe166860 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java @@ -212,8 +212,6 @@ public class AchievementManager extends MiniPlugin level = -level; else if (sender.getName().equalsIgnoreCase("B2_mp")) return 101; - else if (sender.getName().equalsIgnoreCase("fooify")) - level = 404; else if (rank.Has(Rank.OWNER)) level = Math.max(level, 50 + get(sender, Achievement.GLOBAL_GEM_HUNTER).getLevel()); else if (rank.Has(Rank.ADMIN)) From d583598477856c204ca626838e86e026aac78007 Mon Sep 17 00:00:00 2001 From: Aaron Brock Date: Wed, 17 Jun 2015 20:49:35 -0400 Subject: [PATCH 16/22] Fixed double-half-slabs (line 68) Signed-off-by: Aaron Brock --- .../game/games/minestrike/items/grenades/FireGrenadeBase.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/FireGrenadeBase.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/FireGrenadeBase.java index a94e0ee44..a9cdeded4 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/FireGrenadeBase.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/FireGrenadeBase.java @@ -63,7 +63,9 @@ public abstract class FireGrenadeBase extends Grenade final int round = game.getRound(); for (final Block block : blocks.keySet()) { - if (block.getType() != Material.AIR && !block.getType().name().toLowerCase().contains("step")) + + //Edited by TheMineBench, to keep the two-half-slabs from burning + if (block.getType() != Material.AIR && !block.getType().name().toLowerCase().contains("step") || block.getType().name().toLowerCase().contains("double")) continue; if (!UtilBlock.solid(block.getRelative(BlockFace.DOWN))) From 7065ea7319b2d2aec5c25f3f98edba1a97ad927b Mon Sep 17 00:00:00 2001 From: Aaron Brock Date: Wed, 17 Jun 2015 20:54:28 -0400 Subject: [PATCH 17/22] Freezes the time using doDayLightCycle instead of using a UpdateEvent. Signed-off-by: Aaron Brock --- .../mineplex/hub/modules/WorldManager.java | 27 +++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java index c02a3c6a0..20e207cac 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java @@ -46,6 +46,7 @@ import org.bukkit.event.entity.EntityExplodeEvent; import org.bukkit.event.entity.EntityTargetEvent; import org.bukkit.event.player.PlayerDropItemEvent; import org.bukkit.event.player.PlayerPickupItemEvent; +import org.bukkit.event.weather.WeatherChangeEvent; public class WorldManager extends MiniPlugin { @@ -61,6 +62,17 @@ public class WorldManager extends MiniPlugin super("World Manager", manager.getPlugin()); Manager = manager; + + //Added by TheMineBench, to stop day cycles instead of setting the time on update event. + World world = UtilWorld.getWorld("world"); + + world.setGameRuleValue("doDaylightCycle", "false"); + + if (Manager.Type == HubType.Halloween) + world.setTime(16000); + else + world.setTime(6000); + world.setStorm(false); } @EventHandler @@ -216,7 +228,8 @@ public class WorldManager extends MiniPlugin ent.remove(); } } - +//Removed by TheMineBench, time is now stopped when the WorldManager is created +/* @EventHandler public void UpdateWeather(UpdateEvent event) { @@ -232,7 +245,17 @@ public class WorldManager extends MiniPlugin world.setStorm(false); } - +*/ + //Added by TheMineBench. Stops weather from changing. + @EventHandler + public void OnWeather(WeatherChangeEvent event) { + + if (!event.getWorld().getName().equals("world")) + return; + + event.setCancelled(true); + } + @EventHandler public void HalloweenUpdates(UpdateEvent event) { From 389bf7a74c4a84291848762279b40d49df871c2b Mon Sep 17 00:00:00 2001 From: fooify Date: Wed, 29 Jul 2015 10:55:03 -0700 Subject: [PATCH 18/22] please work... --- .../mineplex/core/account/command/UpdateRank.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java b/Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java index b6a6a251b..d2fbb6ef4 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java @@ -19,12 +19,20 @@ public class UpdateRank extends CommandBase { public UpdateRank(CoreClientManager plugin) { - super(plugin, Rank.ADMIN, "updateRank"); + super(plugin, Rank.ADMIN, new Rank[] {Rank.JNR_DEV /*On test servers only*/}, "updateRank"); } @Override public void Execute(final Player caller, String[] args) { + boolean testServer = Plugin.getPlugin().getConfig().getString("serverstatus.group").equalsIgnoreCase("Testing"); + + if (Plugin.Get(caller).GetRank() == Rank.JNR_DEV && !testServer) + { + F.main(Plugin.getName(), F.elem(Rank.JNR_DEV.GetTag(true, true)) + "s are only permitted to set ranks on test servers!"); + return; + } + if (args == null) { UtilPlayer.message(caller, F.main(Plugin.getName(), "/" + AliasUsed + " joeschmo MODERATOR")); @@ -52,9 +60,10 @@ public class UpdateRank extends CommandBase final Rank rank = tempRank; + if (rank == Rank.ADMIN || rank == Rank.YOUTUBE || rank == Rank.TWITCH || rank == Rank.MODERATOR || rank == Rank.JNR_DEV || rank == Rank.HELPER || rank == Rank.ALL || rank == Rank.MAPDEV || rank == Rank.SNR_MODERATOR) if (rank == Rank.ADMIN || rank == Rank.YOUTUBE || rank == Rank.TWITCH || rank == Rank.MODERATOR || rank == Rank.JNR_DEV || rank == Rank.HELPER || rank == Rank.ALL || rank == Rank.MAPDEV || rank == Rank.SNR_MODERATOR) { - if (rank == Rank.ADMIN && !Plugin.hasRank(caller, Rank.LT)) + if (!testServer && rank.Has(Rank.ADMIN) && !Plugin.hasRank(caller, Rank.LT)) { UtilPlayer.message(caller, F.main(Plugin.getName(), ChatColor.RED + "" + ChatColor.BOLD + "Insufficient privileges!")); return; From db5c5a9888c8c5d8ee3c1b712839142bedf92a05 Mon Sep 17 00:00:00 2001 From: fooify Date: Wed, 29 Jul 2015 14:12:52 -0700 Subject: [PATCH 19/22] *crosses fingers* please work! --- .../core/account/command/UpdateRank.java | 5 +- .../mineplex/hub/modules/WorldManager.java | 3 +- .../game/games/turfforts/TurfForts.java | 89 ++++++------------- 3 files changed, 31 insertions(+), 66 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java b/Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java index 21f0ee4c9..529148615 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java @@ -60,7 +60,8 @@ public class UpdateRank extends CommandBase final Rank rank = tempRank; - if (rank == Rank.ADMIN || rank == Rank.YOUTUBE || rank == Rank.TWITCH || rank == Rank.MODERATOR || rank == Rank.HELPER || rank == Rank.ALL || rank == Rank.MAPDEV || rank == Rank.SNR_MODERATOR || rank == Rank.JNR_DEV || rank == Rank.DEVELOPER) + if (rank == Rank.ADMIN || rank == Rank.YOUTUBE || rank == Rank.TWITCH || rank == Rank.MODERATOR || rank == Rank.JNR_DEV || rank == Rank.HELPER || rank == Rank.ALL || rank == Rank.MAPDEV || rank == Rank.SNR_MODERATOR) + if (rank == Rank.ADMIN || rank == Rank.YOUTUBE || rank == Rank.TWITCH || rank == Rank.MODERATOR || rank == Rank.JNR_DEV || rank == Rank.HELPER || rank == Rank.ALL || rank == Rank.MAPDEV || rank == Rank.SNR_MODERATOR) { if (!testServer && rank.Has(Rank.ADMIN) && !Plugin.hasRank(caller, Rank.LT)) { @@ -122,4 +123,4 @@ public class UpdateRank extends CommandBase } } } -} +} \ No newline at end of file diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java index c0f169c4e..6c64291dc 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java @@ -73,7 +73,6 @@ public class WorldManager extends MiniPlugin else world.setTime(6000); world.setStorm(false); - world.setThundering(false); } @EventHandler @@ -341,4 +340,4 @@ public class WorldManager extends MiniPlugin event.setCancelled(true); } } -} +} \ No newline at end of file diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java index 7b4477a05..3e4b5c774 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java @@ -31,6 +31,7 @@ import nautilus.game.arcade.stats.BehindEnemyLinesStatTracker; import nautilus.game.arcade.stats.BlockShreadStatTracker; import nautilus.game.arcade.stats.TheComebackStatTracker; import net.minecraft.server.v1_7_R4.EntityArrow; +import net.minecraft.server.v1_7_R4.Item; import org.bukkit.Bukkit; import org.bukkit.ChatColor; @@ -43,17 +44,15 @@ import org.bukkit.block.BlockFace; import org.bukkit.craftbukkit.v1_7_R4.entity.CraftArrow; import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer; import org.bukkit.entity.Arrow; -import org.bukkit.entity.EntityType; +import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; import org.bukkit.event.HandlerList; import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockEvent; import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.entity.EntityDamageEvent.DamageCause; import org.bukkit.event.entity.EntityShootBowEvent; -import org.bukkit.event.entity.ItemSpawnEvent; import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.event.entity.ProjectileHitEvent; @@ -114,6 +113,7 @@ public class TurfForts extends TeamGame new Kit[] { + new KitMarksman(manager), new KitInfiltrator(manager), new KitShredder(manager), @@ -125,6 +125,7 @@ public class TurfForts extends TeamGame "", "Each kill advances your turf forwards.", "Take over all the turf to win!" + }); this.StrictAntiHack = true; @@ -268,7 +269,7 @@ public class TurfForts extends TeamGame EndCheck(); } } - + @EventHandler public void BowCancel(EntityShootBowEvent event) { @@ -280,13 +281,21 @@ public class TurfForts extends TeamGame ((Player) event.getEntity()).updateInventory(); } } + + @EventHandler + public void BlockBreak(BlockBreakEvent event) + { + if (event.isCancelled()) // this statement might save just a small amount of time + return; + + if(getArcadeManager().isSpectator(event.getPlayer())) event.setCancelled(true); + } - @EventHandler(ignoreCancelled = true) + @EventHandler public void BlockPlace(BlockPlaceEvent event) { - //Remoeved and replaced by ignoreCancelled = true - //if (event.isCancelled()) - // return; + if (event.isCancelled()) + return; GameTeam team = GetTeam(event.getPlayer()); if (team == null) @@ -325,17 +334,6 @@ public class TurfForts extends TeamGame event.setCancelled(true); return; } - - } - - @EventHandler(priority = EventPriority.HIGH) - public void BlockBreak(BlockBreakEvent event) - { - if (!IsAlive(event.getPlayer())) - { - event.setCancelled(true); - return; - } } @EventHandler @@ -343,7 +341,7 @@ public class TurfForts extends TeamGame { if (event.getEntity().getShooter() == null) return; - + if (!(event.getEntity() instanceof Arrow)) return; @@ -359,7 +357,6 @@ public class TurfForts extends TeamGame Manager.getPlugin().getServer().getScheduler().scheduleSyncDelayedTask(Manager.getPlugin(), new Runnable() { - public void run() { try @@ -379,22 +376,21 @@ public class TurfForts extends TeamGame int z = fieldZ.getInt(entityArrow); Block block = arrow.getWorld().getBlockAt(x, y, z); - + if (block.getTypeId() == 35) { - if (block.getData() == 14 /* && team.GetColor() != ChatColor.RED */) + if (block.getData() == 14 && team.GetColor() != ChatColor.RED) { block.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, Material.REDSTONE_BLOCK.getId()); } - else if (block.getData() == 3 /* && team.GetColor() != ChatColor.AQUA */) + else if (block.getData() == 3 && team.GetColor() != ChatColor.AQUA) { block.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, Material.LAPIS_BLOCK.getId()); } - + Bukkit.getPluginManager().callEvent(new ShredBlockEvent(block, arrow)); - - - block.setType(Material.AIR); + + block.breakNaturally(); } arrow.remove(); @@ -669,8 +665,7 @@ public class TurfForts extends TeamGame } } } - - /* + @EventHandler public void ItemRemoval(UpdateEvent event) { @@ -689,37 +684,7 @@ public class TurfForts extends TeamGame ent.remove(); } } - */ - - //Added by TheMineBench. - @EventHandler - public void blockBreak(BlockBreakEvent event) { - - Block block = event.getBlock(); - - GameTeam team = GetTeam(event.getPlayer()); - GameTeam otherTeam = GetOtherTeam(team); - if (block.getType().equals(Material.WOOL) && (block.getData() == 14 && team.GetColor() != ChatColor.RED) || (block.getData() == 3 && team.GetColor() != ChatColor.AQUA)) - { - UtilPlayer.message(event.getPlayer(), F.main("Game", "You cannot break the " + F.elem(otherTeam.GetColor() + otherTeam.GetName()) + " team's blocks!")); - event.setCancelled(true); - return; - } - - } - - public GameTeam GetOtherTeam(GameTeam team) { - return team.GetColor() == ChatColor.RED ? GetTeam(ChatColor.AQUA) : GetTeam(ChatColor.RED); - } - - @EventHandler - public void onItem(ItemSpawnEvent e) { - if (e.getEntityType().equals(EntityType.DROPPED_ITEM)) { - e.setCancelled(true); - } - } - @Override public void EndCheck() { @@ -749,7 +714,7 @@ public class TurfForts extends TeamGame if (player.isOnline()) AddGems(player, 10, "Participation", false, false); } - + //End SetState(GameState.End); } @@ -758,4 +723,4 @@ public class TurfForts extends TeamGame { return _enemyTurf.get(player); } -} +} \ No newline at end of file From b623f025ff01e79e65eeaa2fd28aac176b31825a Mon Sep 17 00:00:00 2001 From: fooify Date: Wed, 29 Jul 2015 14:31:11 -0700 Subject: [PATCH 20/22] manually updating something --- Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java index 6c64291dc..9c21cc979 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java @@ -73,6 +73,7 @@ public class WorldManager extends MiniPlugin else world.setTime(6000); world.setStorm(false); + world.setThundering(false); } @EventHandler From ddc663cc7577b80ef54a2ebc59b708c6840eca6b Mon Sep 17 00:00:00 2001 From: fooify Date: Tue, 11 Aug 2015 09:52:04 -0700 Subject: [PATCH 21/22] remove duplicate method --- .../game/arcade/game/games/turfforts/TurfForts.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java index 4cead9888..3e4b5c774 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java @@ -291,15 +291,6 @@ public class TurfForts extends TeamGame if(getArcadeManager().isSpectator(event.getPlayer())) event.setCancelled(true); } - @EventHandler - public void BlockBreak(BlockBreakEvent event) - { - if (event.isCancelled()) // this statement might save just a small amount of time - return; - - if(getArcadeManager().isSpectator(event.getPlayer())) event.setCancelled(true); - } - @EventHandler public void BlockPlace(BlockPlaceEvent event) { From 07bdbdde46e2a9e7b49f4e8606c9068a0534c18d Mon Sep 17 00:00:00 2001 From: fooify Date: Tue, 11 Aug 2015 09:55:10 -0700 Subject: [PATCH 22/22] minor grammar issue --- .../Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java index bdd807710..64993b32e 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java @@ -74,7 +74,7 @@ public class ServerNpcPage extends ShopPageBase im if (_onMainPage) { - addButton(4, ItemStackFactory.Instance.CreateStack(Material.DIAMOND_BLOCK, (byte) 0, 1, C.cGreen + "Click to Join instantly!"), new IButton() { + addButton(4, ItemStackFactory.Instance.CreateStack(Material.DIAMOND_BLOCK, (byte) 0, 1, C.cGreen + "Click to join instantly!"), new IButton() { @Override public void onClick(Player player, ClickType clickType) {