Merge branch 'master' of github.com:Akarin-project/Paper

2019-03-24 18:18:54 +08:00
parent 0c7b8a1008 8c772dd85f
commit 0907ab86fc
7 changed files with 38 additions and 7 deletions
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1089,6 +1089,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc

    public boolean addEntity(Entity entity, SpawnReason spawnReason) { // Changed signature, added SpawnReason
        // Paper start
+        if (entity.spawnReason == null) entity.spawnReason = spawnReason;
        if (regionLimited != null) {
            return regionLimited.addEntity(entity, spawnReason);
        }