diff options
| author | Jake Potrebic <[email protected]> | 2022-02-28 13:43:31 -0800 |
|---|---|---|
| committer | Jason Penilla <[email protected]> | 2022-02-28 22:52:37 -0700 |
| commit | 60af9b0cb377e106308751e1fefcf40961ea1788 (patch) | |
| tree | 735e75b91c0bbb5a4dc08b63d6051a7e3b609604 /patches/server/0312-Entity-getEntitySpawnReason.patch | |
| parent | 12efc3fcf586c2ea422d3a29b9266a9023031e0f (diff) | |
| download | Paper-60af9b0cb377e106308751e1fefcf40961ea1788.tar.gz Paper-60af9b0cb377e106308751e1fefcf40961ea1788.zip | |
moar fixes
Diffstat (limited to 'patches/server/0312-Entity-getEntitySpawnReason.patch')
| -rw-r--r-- | patches/server/0312-Entity-getEntitySpawnReason.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/server/0312-Entity-getEntitySpawnReason.patch b/patches/server/0312-Entity-getEntitySpawnReason.patch index 2cebcd9b44..7386fa6dd0 100644 --- a/patches/server/0312-Entity-getEntitySpawnReason.patch +++ b/patches/server/0312-Entity-getEntitySpawnReason.patch @@ -35,7 +35,7 @@ index b494d7fc864a2fa734c73c2c4d433e288bccfb26..840bfcea9347b50b422eb7a325a1be43 }); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 1f1442e62c089ef9a922bbee91fc841771e7777f..a896b0b671d0c57de49c8f5e937e6218cbdc7a1e 100644 +index c15c86a0cbb08a0770b88a2f5e2c656a6b79157f..7396e86b750e326653b82ca28ae3bffee3f99344 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -70,6 +70,8 @@ import net.minecraft.world.InteractionHand; @@ -74,7 +74,7 @@ index 1f1442e62c089ef9a922bbee91fc841771e7777f..a896b0b671d0c57de49c8f5e937e6218 + try { + spawnReason = org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.valueOf(spawnReasonName); + } catch (Exception ignored) { -+ LogManager.getLogger().error("Unknown SpawnReason " + spawnReasonName + " for " + this); ++ LOGGER.error("Unknown SpawnReason " + spawnReasonName + " for " + this); + } + } + if (spawnReason == null) { @@ -105,7 +105,7 @@ index 1c76a59eb25148bf2523e9d68cc165b6cd3e1d23..fafbc8601ba3378b86c660f947e23ec2 // Spigot Start if (org.bukkit.craftbukkit.event.CraftEventFactory.callSpawnerSpawnEvent(entity, pos).isCancelled()) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 16f2479de2c330b17c9ef6f3bee8e4ade5b66d15..c066be9b92d73de66ee3f1ef6aa8910de4589210 100644 +index 8e6ae581c714c1fec6b1cdc1c26b83772573ab27..b732d9de71e5799969852a22f22e860637f7d64e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1238,5 +1238,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { |