From d41fb0c9b49ec82c867c5a527c9f80806860000c Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 28 Jul 2018 23:19:32 +0100 Subject: [PATCH] Remove debug --- .../mineplex/game/clans/clans/ClansGame.java | 2 - .../game/clans/clans/loot/LootManager.java | 12 +++- .../clans/moderation/antialt/AltManager.java | 2 +- .../clans/gameplay/HiddenChestManager.java | 15 +---- .../src/mineplex/game/clans/spawn/Spawn.java | 57 +++++++++---------- 5 files changed, 41 insertions(+), 47 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansGame.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansGame.java index a2dd8a5de..87b3ee6cd 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansGame.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansGame.java @@ -243,8 +243,6 @@ public class ClansGame extends MiniPlugin @EventHandler(priority = EventPriority.MONITOR) public void teleport(PlayerTeleportEvent event) { - Bukkit.broadcastMessage(event.getPlayer().getName() + " : " + event.getCause() + " : " + event.isCancelled()); - if (event.getCause() == TeleportCause.UNKNOWN) { UtilPlayer.closeInventoryIfOpen(event.getPlayer()); diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/loot/LootManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/loot/LootManager.java index be424ddd3..d00c19d18 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/loot/LootManager.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/loot/LootManager.java @@ -1,7 +1,11 @@ package mineplex.game.clans.clans.loot; +import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.entity.ItemSpawnEvent; import org.bukkit.inventory.ItemStack; import mineplex.core.common.weight.WeightSet; @@ -257,5 +261,11 @@ public class LootManager public ItemStack getRareItemStack() { return _rareSet.generateRandom().getItemStack(); - } + } + + @EventHandler(priority = EventPriority.MONITOR) + public void itemSpawn(ItemSpawnEvent event) + { + Bukkit.broadcastMessage(event.getEventName() + " " + event.isCancelled() + " " + event.getEntity().getItemStack()); + } } \ No newline at end of file diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/moderation/antialt/AltManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/moderation/antialt/AltManager.java index 8e1321aba..143a2b1ac 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/moderation/antialt/AltManager.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/moderation/antialt/AltManager.java @@ -450,7 +450,7 @@ public class AltManager extends MiniPlugin }); } - @EventHandler(priority = EventPriority.HIGH) +// @EventHandler(priority = EventPriority.HIGH) public void onLogin(AsyncPlayerPreLoginEvent event) { if (event.getLoginResult() != Result.ALLOWED) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/HiddenChestManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/HiddenChestManager.java index a3bca5de0..6f4feb422 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/HiddenChestManager.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/HiddenChestManager.java @@ -41,18 +41,14 @@ public class HiddenChestManager implements Listener if (packet.equals(_lastPacket)) { - packetInfo.getPlayer().sendMessage("Already modified"); return; } - packetInfo.getPlayer().sendMessage("b= " + packet.b + " c=" + packet.c); - // b - Action Id // c - Action Param - How many people have the chest open // a - Block Position if (packet.b == 1 && packet.c > 0 && _openChest.containsValue(packet.a)) { - packetInfo.getPlayer().sendMessage("Removed viewer"); packet.c--; _lastPacket = packet; } @@ -79,25 +75,18 @@ public class HiddenChestManager implements Listener } Location location = event.getClickedBlock().getLocation(); - player.sendMessage("Opening silently..."); _openChest.put(player, new BlockPosition(location.getBlockX(), location.getBlockY(), location.getBlockZ())); } @EventHandler public void handleClose(InventoryCloseEvent event) { - if (_openChest.remove(event.getPlayer()) != null) - { - event.getPlayer().sendMessage("Removed"); - } + _openChest.remove(event.getPlayer()); } @EventHandler public void handleClose(PlayerQuitEvent event) { - if (_openChest.remove(event.getPlayer()) != null) - { - event.getPlayer().sendMessage("Removed"); - } + _openChest.remove(event.getPlayer()); } } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/spawn/Spawn.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/spawn/Spawn.java index 3917c66d8..c59dc5cb3 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/spawn/Spawn.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/spawn/Spawn.java @@ -2,6 +2,33 @@ package mineplex.game.clans.spawn; import java.util.Set; +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.Effect; +import org.bukkit.GameMode; +import org.bukkit.Location; +import org.bukkit.World; +import org.bukkit.block.Block; +import org.bukkit.entity.Entity; +import org.bukkit.entity.ItemFrame; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Monster; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.block.BlockBreakEvent; +import org.bukkit.event.block.BlockBurnEvent; +import org.bukkit.event.block.BlockFromToEvent; +import org.bukkit.event.block.BlockIgniteEvent; +import org.bukkit.event.block.BlockIgniteEvent.IgniteCause; +import org.bukkit.event.entity.CreatureSpawnEvent; +import org.bukkit.event.entity.EntityDamageEvent; +import org.bukkit.event.entity.EntityDeathEvent; +import org.bukkit.event.entity.EntityTargetEvent; +import org.bukkit.event.hanging.HangingBreakByEntityEvent; +import org.bukkit.event.player.PlayerRespawnEvent; +import org.bukkit.event.player.PlayerVelocityEvent; +import org.bukkit.plugin.java.JavaPlugin; + import mineplex.core.MiniPlugin; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilParticle; @@ -18,34 +45,6 @@ import mineplex.minecraft.game.classcombat.Skill.event.SkillTriggerEvent; import mineplex.minecraft.game.classcombat.item.event.WebTossEvent; import mineplex.minecraft.game.core.damage.CustomDamageEvent; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.Effect; -import org.bukkit.GameMode; -import org.bukkit.Location; -import org.bukkit.World; -import org.bukkit.block.Block; -import org.bukkit.entity.Entity; -import org.bukkit.entity.ItemFrame; -import org.bukkit.entity.LivingEntity; -import org.bukkit.entity.Monster; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.block.BlockBreakEvent; -import org.bukkit.event.block.BlockBurnEvent; -import org.bukkit.event.block.BlockFromToEvent; -import org.bukkit.event.block.BlockIgniteEvent; -import org.bukkit.event.block.BlockIgniteEvent.IgniteCause; -import org.bukkit.event.entity.CreatureSpawnEvent; -import org.bukkit.event.entity.EntityDamageEvent; -import org.bukkit.event.entity.EntityDeathEvent; -import org.bukkit.event.entity.EntityTargetEvent; -import org.bukkit.event.hanging.HangingBreakByEntityEvent; -import org.bukkit.event.player.PlayerRespawnEvent; -import org.bukkit.event.player.PlayerVelocityEvent; -import org.bukkit.plugin.java.JavaPlugin; - public class Spawn extends MiniPlugin { public static final int SPAWN_RADIUS = 32; @@ -335,7 +334,6 @@ public class Spawn extends MiniPlugin { if (getSpawnWorld().getTime() < 12000) { - Bukkit.broadcastMessage("Mob spawning disabled"); getSpawnWorld().setGameRuleValue("doMobSpawning", "false"); } } @@ -343,7 +341,6 @@ public class Spawn extends MiniPlugin { if (getSpawnWorld().getTime() > 12000) { - Bukkit.broadcastMessage("Mob spawning enabled"); getSpawnWorld().setGameRuleValue("doMobSpawning", "true"); } }