diff --git a/patches/minecraft/net/minecraft/client/network/play/ClientPlayNetHandler.java.patch b/patches/minecraft/net/minecraft/client/network/play/ClientPlayNetHandler.java.patch index 977a4ec76c..8a540a3464 100644 --- a/patches/minecraft/net/minecraft/client/network/play/ClientPlayNetHandler.java.patch +++ b/patches/minecraft/net/minecraft/client/network/play/ClientPlayNetHandler.java.patch @@ -36,17 +36,14 @@ } public void func_147279_a(SAnimateHandPacket p_147279_1_) { -@@ -854,8 +_,8 @@ +@@ -854,6 +_,7 @@ livingentity.func_213312_b(d0, d1, d2); livingentity.field_70761_aq = (float)(p_147281_1_.func_149032_n() * 360) / 256.0F; livingentity.field_70759_as = (float)(p_147281_1_.func_149032_n() * 360) / 256.0F; -- if (livingentity instanceof EnderDragonEntity) { -- EnderDragonPartEntity[] aenderdragonpartentity = ((EnderDragonEntity)livingentity).func_213404_dT(); -+ if (livingentity.isMultipartEntity()) { -+ net.minecraftforge.entity.PartEntity[] aenderdragonpartentity = livingentity.getParts(); ++ if (false) // Forge: Fix MC-158205: Moved into setId() + if (livingentity instanceof EnderDragonEntity) { + EnderDragonPartEntity[] aenderdragonpartentity = ((EnderDragonEntity)livingentity).func_213404_dT(); - for(int i = 0; i < aenderdragonpartentity.length; ++i) { - aenderdragonpartentity[i].func_145769_d(i + p_147281_1_.func_149024_d()); @@ -1004,8 +_,10 @@ clientplayerentity1.func_233645_dx_().func_233784_a_(clientplayerentity.func_233645_dx_()); } diff --git a/patches/minecraft/net/minecraft/entity/Entity.java.patch b/patches/minecraft/net/minecraft/entity/Entity.java.patch index d50bcf6cce..d2ffc9cc98 100644 --- a/patches/minecraft/net/minecraft/entity/Entity.java.patch +++ b/patches/minecraft/net/minecraft/entity/Entity.java.patch @@ -7,7 +7,7 @@ -public abstract class Entity implements INameable, ICommandSource { +public abstract class Entity extends net.minecraftforge.common.capabilities.CapabilityProvider implements INameable, ICommandSource, net.minecraftforge.common.extensions.IForgeEntity { protected static final Logger field_184243_a = LogManager.getLogger(); - private static final AtomicInteger field_213331_b = new AtomicInteger(); + protected static final AtomicInteger field_213331_b = new AtomicInteger(); private static final List field_190535_b = Collections.emptyList(); private static final AxisAlignedBB field_174836_a = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.0D, 0.0D, 0.0D); private static double field_70155_l = 1.0D; diff --git a/patches/minecraft/net/minecraft/entity/boss/dragon/EnderDragonEntity.java.patch b/patches/minecraft/net/minecraft/entity/boss/dragon/EnderDragonEntity.java.patch index 55172aa742..b9eb9f2fc0 100644 --- a/patches/minecraft/net/minecraft/entity/boss/dragon/EnderDragonEntity.java.patch +++ b/patches/minecraft/net/minecraft/entity/boss/dragon/EnderDragonEntity.java.patch @@ -1,5 +1,20 @@ --- a/net/minecraft/entity/boss/dragon/EnderDragonEntity.java +++ b/net/minecraft/entity/boss/dragon/EnderDragonEntity.java +@@ -104,6 +_,14 @@ + } + + this.field_184677_bJ = new PhaseManager(this); ++ this.func_145769_d(field_213331_b.getAndAdd(this.field_70977_g.length + 1) + 1); // Forge: Fix MC-158205: Make sure part ids are successors of parent mob id ++ } ++ ++ @Override ++ public void func_145769_d(int p_145769_1_) { ++ super.func_145769_d(p_145769_1_); ++ for(int i = 0; i < this.field_70977_g.length; ++i) // Forge: Fix MC-158205: Set part ids to successors of parent mob id ++ this.field_70977_g[i].func_145769_d(p_145769_1_ + i + 1); + } + + public static AttributeModifierMap.MutableAttribute func_234257_m_() { @@ -408,8 +_,8 @@ BlockPos blockpos = new BlockPos(k1, l1, i2); BlockState blockstate = this.field_70170_p.func_180495_p(blockpos); diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg index 0e1b137e72..44da42cc74 100644 --- a/src/main/resources/META-INF/accesstransformer.cfg +++ b/src/main/resources/META-INF/accesstransformer.cfg @@ -224,6 +224,7 @@ protected net.minecraft.data.loot.BlockLootTables func_218570_h(Lnet/minecraft/b protected net.minecraft.data.loot.EntityLootTables field_218586_a # ENTITY_ON_FIRE protected net.minecraft.data.loot.EntityLootTables func_218582_a(Lnet/minecraft/entity/EntityType;Lnet/minecraft/loot/LootTable$Builder;)V # add protected net.minecraft.data.loot.EntityLootTables func_218585_a(Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/loot/LootTable$Builder;)V # add +protected net.minecraft.entity.Entity field_213331_b # ENTITY_COUNTER public net.minecraft.entity.Entity func_70022_Q()Ljava/lang/String; # getEncodeId public net.minecraft.entity.EntitySpawnPlacementRegistry func_209343_a(Lnet/minecraft/entity/EntityType;Lnet/minecraft/entity/EntitySpawnPlacementRegistry$PlacementType;Lnet/minecraft/world/gen/Heightmap$Type;Lnet/minecraft/entity/EntitySpawnPlacementRegistry$IPlacementPredicate;)V # register public net.minecraft.entity.MobEntity field_70714_bg # goalSelector