SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the CraftWorld weather methods duplicating events.

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2015-01-13 20:40:23 +11:00
parent fb01afbadc
commit 7f26add625
2 changed files with 11 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
View File

@@ -751,20 +751,7 @@ public class CraftWorld implements World {
}
public void setStorm(boolean hasStorm) {
CraftServer server = world.getServer();
WeatherChangeEvent weather = new WeatherChangeEvent(this, hasStorm);
server.getPluginManager().callEvent(weather);
if (!weather.isCancelled()) {
world.worldData.setStorm(hasStorm);
// These numbers are from Minecraft
if (hasStorm) {
setWeatherDuration(rand.nextInt(12000) + 12000);
} else {
setWeatherDuration(rand.nextInt(168000) + 12000);
}
}
world.worldData.setStorm(hasStorm);
}
public int getWeatherDuration() {
@@ -780,21 +767,7 @@ public class CraftWorld implements World {
}
public void setThundering(boolean thundering) {
if (thundering && !hasStorm()) setStorm(true);
CraftServer server = world.getServer();
ThunderChangeEvent thunder = new ThunderChangeEvent(this, thundering);
server.getPluginManager().callEvent(thunder);
if (!thunder.isCancelled()) {
world.worldData.setThundering(thundering);
// These numbers are from Minecraft
if (thundering) {
setThunderDuration(rand.nextInt(12000) + 3600);
} else {
setThunderDuration(rand.nextInt(168000) + 12000);
}
}
world.worldData.setThundering(thundering);
}
public int getThunderDuration() {