From bb4e78da90a1b614b6f1743662915fff4866e1e5 Mon Sep 17 00:00:00 2001 From: DaemonUmbra Date: Mon, 2 Dec 2019 17:54:00 -0500 Subject: [PATCH] Fixed invocation of Vanilla spawn logic (#6334) Forge's replacement of the Vanilla logic gets inverted, so the Vanilla logic inside that replacement must be inverted to correct for this. (Fixes #6332) --- src/main/java/net/minecraftforge/event/ForgeEventFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/minecraftforge/event/ForgeEventFactory.java b/src/main/java/net/minecraftforge/event/ForgeEventFactory.java index 62883a6a1e..325633807d 100644 --- a/src/main/java/net/minecraftforge/event/ForgeEventFactory.java +++ b/src/main/java/net/minecraftforge/event/ForgeEventFactory.java @@ -185,7 +185,7 @@ public class ForgeEventFactory { Result result = canEntitySpawn(entity, world, x, y, z, spawner, SpawnReason.SPAWNER); if (result == Result.DEFAULT) - return entity.canSpawn(world, SpawnReason.SPAWNER) || !entity.isNotColliding(world); // vanilla logic + return entity.canSpawn(world, SpawnReason.SPAWNER) && entity.isNotColliding(world); // vanilla logic (inverted) else return result == Result.ALLOW; }