Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-03-13 07:10:08 +01:00
Code Issues Projects Releases Wiki Activity

Added events related to weather in 1.5. Thanks wizjany!

Browse Source 
By: EvilSeph <evilseph@unaligned.org>
This commit is contained in:
CraftBukkit/Spigot 2011-04-25 19:47:25 -04:00
parent 18394a8207
commit 2980396ae5
3 changed files with 55 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,8 @@ import java.util.Random;
import net.minecraft.server.*; import net.minecraft.server.*;
import org.bukkit.entity.Arrow; import org.bukkit.entity.Arrow;
import org.bukkit.event.weather.WeatherChangeEvent;
import org.bukkit.event.weather.ThunderChangeEvent;
import org.bukkit.event.world.SpawnChangeEvent; import org.bukkit.event.world.SpawnChangeEvent;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.entity.Boat; import org.bukkit.entity.Boat;
@ -554,13 +556,19 @@ public class CraftWorld implements World {
} }
public void setStorm(boolean hasStorm) { public void setStorm(boolean hasStorm) {
world.worldData.b(hasStorm); CraftServer server = world.getServer();
// These numbers are from Minecraft WeatherChangeEvent weather = new WeatherChangeEvent((org.bukkit.World) this, hasStorm);
if (hasStorm) { server.getPluginManager().callEvent(weather);
setWeatherDuration(rand.nextInt(12000) + 12000); if (!weather.isCancelled()) {
} else { world.worldData.b(hasStorm);
setWeatherDuration(rand.nextInt(168000) + 12000);
// These numbers are from Minecraft
if (hasStorm) {
setWeatherDuration(rand.nextInt(12000) + 12000);
} else {
setWeatherDuration(rand.nextInt(168000) + 12000);
}
} }
} }
@ -577,13 +585,19 @@ public class CraftWorld implements World {
} }
public void setThundering(boolean thundering) { public void setThundering(boolean thundering) {
world.worldData.a(thundering); CraftServer server = world.getServer();
// These numbers are from Minecraft ThunderChangeEvent thunder = new ThunderChangeEvent((org.bukkit.World) this, thundering);
if (thundering) { server.getPluginManager().callEvent(thunder);
setThunderDuration(rand.nextInt(12000) + 3600); if (!thunder.isCancelled()) {
} else { world.worldData.a(thundering);
setThunderDuration(rand.nextInt(168000) + 12000);
// These numbers are from Minecraft
if (thundering) {
setThunderDuration(rand.nextInt(12000) + 3600);
} else {
setThunderDuration(rand.nextInt(168000) + 12000);
}
} }
} }

24
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
View File

@ -1,8 +1,11 @@
package org.bukkit.craftbukkit.entity; package org.bukkit.craftbukkit.entity;
import net.minecraft.server.EntityCreeper; import net.minecraft.server.EntityCreeper;
import net.minecraft.server.WorldServer;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Creeper; import org.bukkit.entity.Creeper;
import org.bukkit.event.entity.CreeperPowerEvent;
public class CraftCreeper extends CraftMonster implements Creeper { public class CraftCreeper extends CraftMonster implements Creeper {
@ -20,11 +23,28 @@ public class CraftCreeper extends CraftMonster implements Creeper {
} }
public void setPowered(boolean powered) { public void setPowered(boolean powered) {
// CraftBukkit start
CraftServer server = this.server;
org.bukkit.entity.Entity entity = this.getHandle().getBukkitEntity();
if (powered) { if (powered) {
getHandle().W().b(17, (byte)1); CreeperPowerEvent event = new CreeperPowerEvent(entity, CreeperPowerEvent.PowerCause.SET_ON);
server.getPluginManager().callEvent(event);
if (!event.isCancelled()) {
getHandle().W().b(17, (byte)1);
}
} else { } else {
getHandle().W().b(17, (byte)0); CreeperPowerEvent event = new CreeperPowerEvent(entity, CreeperPowerEvent.PowerCause.SET_OFF);
server.getPluginManager().callEvent(event);
if (!event.isCancelled()) {
getHandle().W().b(17, (byte)0);
}
} }
// CraftBukkit end
} }
} }

2
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPig.java
View File

@ -1,9 +1,7 @@
package org.bukkit.craftbukkit.entity; package org.bukkit.craftbukkit.entity;
import net.minecraft.server.EntityPig; import net.minecraft.server.EntityPig;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.entity.CraftAnimals;
import org.bukkit.entity.Pig; import org.bukkit.entity.Pig;
public class CraftPig extends CraftAnimals implements Pig { public class CraftPig extends CraftAnimals implements Pig {