From 1abcb187e63dacadb2862bbb2cf689215e3f1f4a Mon Sep 17 00:00:00 2001 From: Eric Stokes Date: Sun, 7 Aug 2011 21:06:50 -0600 Subject: [PATCH] Removed lightning from what we're watching --- .../onarandombox/MultiverseCore/MultiverseCore.java | 1 - .../MultiverseCore/listeners/MVWeatherListener.java | 10 ---------- 2 files changed, 11 deletions(-) diff --git a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java index 67b16b7a..9235741b 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java +++ b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java @@ -200,7 +200,6 @@ public class MultiverseCore extends JavaPlugin implements LoggablePlugin { pm.registerEvent(Event.Type.WEATHER_CHANGE, this.weatherListener, Priority.Normal, this); pm.registerEvent(Event.Type.THUNDER_CHANGE, this.weatherListener, Priority.Normal, this); - pm.registerEvent(Event.Type.LIGHTNING_STRIKE, this.weatherListener, Priority.Normal, this); } /** diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVWeatherListener.java b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVWeatherListener.java index 24c9b3bd..bd246a30 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVWeatherListener.java +++ b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVWeatherListener.java @@ -1,6 +1,5 @@ package com.onarandombox.MultiverseCore.listeners; -import org.bukkit.event.weather.LightningStrikeEvent; import org.bukkit.event.weather.ThunderChangeEvent; import org.bukkit.event.weather.WeatherChangeEvent; import org.bukkit.event.weather.WeatherListener; @@ -34,13 +33,4 @@ public class MVWeatherListener extends WeatherListener { event.setCancelled((event.toThunderState() && !world.getWeatherEnabled())); } } - - @Override - public void onLightningStrike(LightningStrikeEvent event) { - MVWorld world = this.plugin.getMVWorld(event.getWorld().getName()); - if (world != null) { - // If it's going to start raining and we have weather disabled - event.setCancelled((!world.getWeatherEnabled())); - } - } }