OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-22 08:15:05 +01:00
Code Issues Projects Releases Packages Wiki Activity

Added SpawnReasons to CreatureSpawn events. Thanks winsock!

Browse source 
By: EvilSeph <evilseph@unaligned.org>
This commit is contained in:
CraftBukkit/Spigot 2011-06-21 16:20:11 -04:00
parent 82899bb5e6
commit 9e46607f98
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
View file

@ -12,6 +12,7 @@ import net.minecraft.server.*;
import org.bukkit.entity.Arrow; import org.bukkit.entity.Arrow;
import org.bukkit.Effect; import org.bukkit.Effect;
import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
import org.bukkit.event.weather.WeatherChangeEvent; import org.bukkit.event.weather.WeatherChangeEvent;
import org.bukkit.event.weather.ThunderChangeEvent; import org.bukkit.event.weather.ThunderChangeEvent;
import org.bukkit.event.world.SpawnChangeEvent; import org.bukkit.event.world.SpawnChangeEvent;
@ -346,7 +347,7 @@ public class CraftWorld implements World {
EntityLiving entityCreature = (EntityLiving) EntityTypes.a(creatureType.getName(), world); EntityLiving entityCreature = (EntityLiving) EntityTypes.a(creatureType.getName(), world);
entityCreature.setPosition(loc.getX(), loc.getY(), loc.getZ()); entityCreature.setPosition(loc.getX(), loc.getY(), loc.getZ());
creature = (LivingEntity) CraftEntity.getEntity(server, entityCreature); creature = (LivingEntity) CraftEntity.getEntity(server, entityCreature);
world.addEntity(entityCreature); world.addEntity(entityCreature, SpawnReason.CUSTOM);
} catch (Exception e) { } catch (Exception e) {
// if we fail, for any reason, return null. // if we fail, for any reason, return null.
creature = null; creature = null;

5
paper-server/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
View file

@ -41,6 +41,7 @@ import org.bukkit.event.block.Action;
import org.bukkit.event.block.BlockDamageEvent; import org.bukkit.event.block.BlockDamageEvent;
import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.entity.CreatureSpawnEvent; import org.bukkit.event.entity.CreatureSpawnEvent;
import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
import org.bukkit.event.entity.EntityTameEvent; import org.bukkit.event.entity.EntityTameEvent;
import org.bukkit.event.entity.ItemSpawnEvent; import org.bukkit.event.entity.ItemSpawnEvent;
import org.bukkit.event.player.PlayerBucketEmptyEvent; import org.bukkit.event.player.PlayerBucketEmptyEvent;
@ -190,7 +191,7 @@ public class CraftEventFactory {
/** /**
* CreatureSpawnEvent * CreatureSpawnEvent
*/ */
public static CreatureSpawnEvent callCreatureSpawnEvent(EntityLiving entityliving) { public static CreatureSpawnEvent callCreatureSpawnEvent(EntityLiving entityliving, SpawnReason spawnReason) {
org.bukkit.entity.Entity entity = entityliving.getBukkitEntity(); org.bukkit.entity.Entity entity = entityliving.getBukkitEntity();
CraftServer craftServer = (CraftServer) entity.getServer(); CraftServer craftServer = (CraftServer) entity.getServer();
@ -229,7 +230,7 @@ public class CraftEventFactory {
type = CreatureType.MONSTER; type = CreatureType.MONSTER;
} }
CreatureSpawnEvent event = new CreatureSpawnEvent(entity, type, entity.getLocation()); CreatureSpawnEvent event = new CreatureSpawnEvent(entity, type, entity.getLocation(), spawnReason);
craftServer.getPluginManager().callEvent(event); craftServer.getPluginManager().callEvent(event);
return event; return event;
} }