From a19ade073902eeecfd41055ae066be0a7e93607d Mon Sep 17 00:00:00 2001 From: NewGarbo Date: Thu, 26 Nov 2015 00:53:01 +0000 Subject: [PATCH] rain rain go away --- .../src/mineplex/game/clans/clans/ClansGame.java | 3 ++- .../src/mineplex/game/clans/gameplay/Gameplay.java | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) 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 d9e8693dd..a0e0ace37 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,7 +243,8 @@ public class ClansGame extends MiniPlugin } @EventHandler - public void respawn(PlayerRespawnEvent event){ + public void respawn(PlayerRespawnEvent event) + { _clans.getItemMapManager().setMap(event.getPlayer()); } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/Gameplay.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/Gameplay.java index afb91ab7d..06b4ba957 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/Gameplay.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/Gameplay.java @@ -10,6 +10,7 @@ import org.bukkit.Effect; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.Sound; +import org.bukkit.World; import org.bukkit.block.Biome; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; @@ -36,6 +37,7 @@ import org.bukkit.event.player.PlayerBucketFillEvent; import org.bukkit.event.player.PlayerFishEvent; import org.bukkit.event.player.PlayerFishEvent.State; import org.bukkit.event.player.PlayerInteractEvent; +import org.bukkit.event.weather.WeatherChangeEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.plugin.java.JavaPlugin; @@ -447,6 +449,18 @@ public class Gameplay extends MiniPlugin saplingArea.add(0, 1, 0).getBlock().setType(Material.SAPLING); saplingArea.getBlock().setData(block.getData()); } + + @EventHandler + public void killRain(UpdateEvent event) + { + if (event.getType() != UpdateType.TWOSEC){ + for (World world : Bukkit.getWorlds()){ + world.setWeatherDuration(0); + world.setThunderDuration(0); + world.setThundering(false); + } + } + } @EventHandler public void WildfireSpread(BlockBurnEvent event)