From 025855af422443a37b9f6348f22b0d1920e0929b Mon Sep 17 00:00:00 2001 From: gnembon Date: Fri, 27 Dec 2019 23:29:58 -0400 Subject: [PATCH] 1.15.1 build 17 --- .../carpet/mixins/Entity_portalSuffocationMixin.java | 4 ++-- src/main/java/carpet/mixins/PlayerEntityMixin.java | 2 +- .../mixins/PortalForcer_portalSuffocationMixin.java | 6 +++--- src/main/java/carpet/mixins/VillagerEntity_aiMixin.java | 9 +++++---- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/main/java/carpet/mixins/Entity_portalSuffocationMixin.java b/src/main/java/carpet/mixins/Entity_portalSuffocationMixin.java index 47bddb1c..6980c334 100644 --- a/src/main/java/carpet/mixins/Entity_portalSuffocationMixin.java +++ b/src/main/java/carpet/mixins/Entity_portalSuffocationMixin.java @@ -19,9 +19,9 @@ public abstract class Entity_portalSuffocationMixin @Inject(method = "changeDimension", at = @At( value = "INVOKE", - target = "Lnet/minecraft/entity/Entity;getLastPortalDirection()Lnet/minecraft/util/math/Direction;" + target = "Lnet/minecraft/entity/Entity;getLastNetherPortalDirection()Lnet/minecraft/util/math/Direction;" )) - private void registerEntityDimensionChange(DimensionType dimensionType_1, CallbackInfoReturnable cir) + private void registerEntityDimensionChange(DimensionType newDimension, CallbackInfoReturnable cir) { if (CarpetSettings.portalSuffocationFix) { diff --git a/src/main/java/carpet/mixins/PlayerEntityMixin.java b/src/main/java/carpet/mixins/PlayerEntityMixin.java index 5070481c..d72cddb8 100644 --- a/src/main/java/carpet/mixins/PlayerEntityMixin.java +++ b/src/main/java/carpet/mixins/PlayerEntityMixin.java @@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.ModifyConstant; @Mixin(PlayerEntity.class) public abstract class PlayerEntityMixin { - @ModifyConstant(method = "getMaxPortalTime", + @ModifyConstant(method = "getMaxNetherPortalTime", constant = @Constant(intValue = 1)) private int addFillUpdatesInt(int original) { if (CarpetSettings.portalCreativeDelay) diff --git a/src/main/java/carpet/mixins/PortalForcer_portalSuffocationMixin.java b/src/main/java/carpet/mixins/PortalForcer_portalSuffocationMixin.java index 9ae27930..a576be5b 100644 --- a/src/main/java/carpet/mixins/PortalForcer_portalSuffocationMixin.java +++ b/src/main/java/carpet/mixins/PortalForcer_portalSuffocationMixin.java @@ -20,13 +20,13 @@ public class PortalForcer_portalSuffocationMixin { @Inject(method = "usePortal", at = @At( value = "INVOKE", - target = "Lnet/minecraft/entity/Entity;getLastPortalDirectionVector()Lnet/minecraft/util/math/Vec3d;" + target = "Lnet/minecraft/entity/Entity;getLastNetherPortalDirectionVector()Lnet/minecraft/util/math/Vec3d;" )) - private void registerEntityDimensionChange(Entity entity_1, float float_1, CallbackInfoReturnable cir) + private void registerEntityDimensionChange(Entity entity, float f, CallbackInfoReturnable cir) { if (CarpetSettings.portalSuffocationFix) { - CarpetSettings.currentTelepotingEntityBox = entity_1.getBoundingBox(); + CarpetSettings.currentTelepotingEntityBox = entity.getBoundingBox(); CarpetSettings.fixedPosition = null; } } diff --git a/src/main/java/carpet/mixins/VillagerEntity_aiMixin.java b/src/main/java/carpet/mixins/VillagerEntity_aiMixin.java index 21691417..f592c1ab 100644 --- a/src/main/java/carpet/mixins/VillagerEntity_aiMixin.java +++ b/src/main/java/carpet/mixins/VillagerEntity_aiMixin.java @@ -151,7 +151,7 @@ public abstract class VillagerEntity_aiMixin extends AbstractTraderEntity pv.x, pv.y+1.5, pv.z, 50, 0.1, 0.3, 0.1, 0.0); } - else if (method_20642((VillagerEntity)(Object)this, poi.getPos())) + else if (canReachHome((VillagerEntity)(Object)this, poi.getPos())) ((ServerWorld) getEntityWorld()).spawnParticles(ParticleTypes.END_ROD, pv.x, pv.y+1, pv.z, 50, 0.1, 0.3, 0.1, 0.0); @@ -166,9 +166,10 @@ public abstract class VillagerEntity_aiMixin extends AbstractTraderEntity } } - private boolean method_20642(VillagerEntity villagerEntity_1, BlockPos blockPos_1) { - Path path_1 = villagerEntity_1.getNavigation().findPathTo(blockPos_1, PointOfInterestType.HOME.method_21648()); - return path_1 != null && path_1.reachesTarget(); + // stolen from VillagerBreedTask + private boolean canReachHome(VillagerEntity villager, BlockPos pos) { + Path path = villager.getNavigation().findPathTo(pos, PointOfInterestType.HOME.getSearchDistance()); + return path != null && path.reachesTarget(); }