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

Check for missing EntityType for PreCreatureSpawnEvent - Resolves #973

Browse Source
This commit is contained in:
Aikar
2018-01-15 23:44:21 -05:00
parent 093629c1f2
commit 8e612cbc0a
1 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Spigot-Server-Patches/PreCreatureSpawnEvent.patch
View File

@@ -15,7 +15,7 @@ instead and save a lot of server resources.
See: https://github.com/PaperMC/Paper/issues/917 See: https://github.com/PaperMC/Paper/issues/917
diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
index c29df55fa..d6c73a5a0 100644 index c29df55fa..3c591e67e 100644
--- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
+++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
@@ -0,0 +0,0 @@ @@ -0,0 +0,0 @@
@@ -34,10 +34,13 @@ index c29df55fa..d6c73a5a0 100644
+ if (this.getMobName() == null) { + if (this.getMobName() == null) {
+ return; + return;
+ } + }
+ String key = this.getMobName().getKey();
+ org.bukkit.entity.EntityType type = org.bukkit.entity.EntityType.fromName(key);
+ if (type != null) {
+ com.destroystokyo.paper.event.entity.PreCreatureSpawnEvent event; + com.destroystokyo.paper.event.entity.PreCreatureSpawnEvent event;
+ event = new com.destroystokyo.paper.event.entity.PreCreatureSpawnEvent( + event = new com.destroystokyo.paper.event.entity.PreCreatureSpawnEvent(
+ MCUtil.toLocation(world, d3, d4, d5), + MCUtil.toLocation(world, d3, d4, d5),
+ org.bukkit.entity.EntityType.fromName(this.getMobName().getKey()), + type,
+ org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER + org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER
+ ); + );
+ if (!event.callEvent()) { + if (!event.callEvent()) {
@@ -46,12 +49,15 @@ index c29df55fa..d6c73a5a0 100644
+ } + }
+ continue; + continue;
+ } + }
+ } else {
+ MinecraftServer.LOGGER.warn("Warning, could not find EntityType for " + key + " - Please report this to Paper at https://github.com/PaperMC/Paper/issues");
+ }
+ // Paper end + // Paper end
Entity entity = ChunkRegionLoader.a(nbttagcompound, world, d3, d4, d5, false); Entity entity = ChunkRegionLoader.a(nbttagcompound, world, d3, d4, d5, false);
if (entity == null) { if (entity == null) {
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
index 2cd063829..1137dda86 100644 index 2cd063829..f64de94fa 100644
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
@@ -0,0 +0,0 @@ public final class SpawnerCreature { @@ -0,0 +0,0 @@ public final class SpawnerCreature {
@@ -60,10 +66,12 @@ index 2cd063829..1137dda86 100644
if (worldserver.a(enumcreaturetype, biomebase_biomemeta, (BlockPosition) blockposition_mutableblockposition) && a(EntityPositionTypes.a(biomebase_biomemeta.b), worldserver, blockposition_mutableblockposition)) { if (worldserver.a(enumcreaturetype, biomebase_biomemeta, (BlockPosition) blockposition_mutableblockposition) && a(EntityPositionTypes.a(biomebase_biomemeta.b), worldserver, blockposition_mutableblockposition)) {
+ // Paper start + // Paper start
+ com.destroystokyo.paper.event.entity.PreCreatureSpawnEvent event; + com.destroystokyo.paper.event.entity.PreCreatureSpawnEvent event;
+ Class<? extends EntityInsentient> cls = biomebase_biomemeta.b;
+ org.bukkit.entity.EntityType type = EntityTypes.clsToTypeMap.get(cls);
+ if (type != null) {
+ event = new com.destroystokyo.paper.event.entity.PreCreatureSpawnEvent( + event = new com.destroystokyo.paper.event.entity.PreCreatureSpawnEvent(
+ MCUtil.toLocation(worldserver, blockposition_mutableblockposition), + MCUtil.toLocation(worldserver, blockposition_mutableblockposition),
+ EntityTypes.clsToTypeMap.get(biomebase_biomemeta.b), + type, SpawnReason.NATURAL
+ SpawnReason.NATURAL
+ ); + );
+ if (!event.callEvent()) { + if (!event.callEvent()) {
+ if (event.shouldAbortSpawn()) { + if (event.shouldAbortSpawn()) {
@@ -73,6 +81,9 @@ index 2cd063829..1137dda86 100644
+ ++j4; + ++j4;
+ continue; + continue;
+ } + }
+ } else {
+ MinecraftServer.LOGGER.warn("Warning, could not find EntityType for " + cls.getName() + " contains: " + (EntityTypes.clsToTypeMap.containsKey(cls) ? "yes" : "no") + " - Please report this to Paper at https://github.com/PaperMC/Paper/issues");
+ }
+ // Paper end + // Paper end
EntityInsentient entityinsentient; EntityInsentient entityinsentient;