Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
910a1ff9f7 Add '/paper mobcaps' and '/paper playermobcaps' commands (#6470)
5960af9d87 Updated Upstream (Bukkit/CraftBukkit) (#6568)
This commit is contained in:
William Blake Galbreath
2021-09-07 03:34:05 -05:00
parent b6d1b6af37
commit b376172ea0
4 changed files with 17 additions and 19 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] EMC - MonsterEggSpawnEvent
diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
index 7255d31a629992807589faeb389f0f18f673c976..20094345f90dba666902a8694035b47e0606e02c 100644
index d354b44ecabdd2ce245c224c6e22bfd5c2e58553..88e556fc543c3143bffc62edf868c9dc44ab2597 100644
--- a/src/main/java/net/minecraft/world/entity/EntityType.java
+++ b/src/main/java/net/minecraft/world/entity/EntityType.java
@@ -336,13 +336,20 @@ public class EntityType<T extends Entity> implements EntityTypeTest<Entity, T> {
@@ -335,13 +335,20 @@ public class EntityType<T extends Entity> implements EntityTypeTest<Entity, T> {
@Nullable
public Entity spawn(ServerLevel world, @Nullable ItemStack stack, @Nullable Player player, BlockPos pos, MobSpawnType spawnReason, boolean alignPosition, boolean invertY) {
@@ -31,7 +31,7 @@ index 7255d31a629992807589faeb389f0f18f673c976..20094345f90dba666902a8694035b47e
}
@Nullable
@@ -367,9 +374,29 @@ public class EntityType<T extends Entity> implements EntityTypeTest<Entity, T> {
@@ -366,9 +373,29 @@ public class EntityType<T extends Entity> implements EntityTypeTest<Entity, T> {
}
}
// Paper end