diff --git a/patches/minecraft/net/minecraft/world/entity/LivingEntity.java.patch b/patches/minecraft/net/minecraft/world/entity/LivingEntity.java.patch index 6adcbacc7d..3bfde8f8ec 100644 --- a/patches/minecraft/net/minecraft/world/entity/LivingEntity.java.patch +++ b/patches/minecraft/net/minecraft/world/entity/LivingEntity.java.patch @@ -464,7 +464,7 @@ if (this.isInLava()) { d3 = this.getFluidHeight(FluidTags.LAVA); } else { -@@ -2931,15 +_,22 @@ +@@ -2931,15 +_,19 @@ double d4 = this.getFluidJumpThreshold(); if (!flag || this.onGround() && !(d3 > d4)) { if (!this.isInLava() || this.onGround() && !(d3 > d4)) { @@ -478,10 +478,7 @@ + } } else { - this.jumpInLiquid(FluidTags.LAVA); -+ var old = this.getDeltaMovement(); + this.jumpInFluid(net.minecraftforge.common.ForgeMod.LAVA_TYPE.get()); -+ if (this instanceof Player) -+ System.out.println(old + " " + this.getDeltaMovement()); } } else { - this.jumpInLiquid(FluidTags.WATER); diff --git a/src/main/java/net/minecraftforge/resource/ResourcePackLoader.java b/src/main/java/net/minecraftforge/resource/ResourcePackLoader.java index 05876cfdbd..3ee8591ff1 100644 --- a/src/main/java/net/minecraftforge/resource/ResourcePackLoader.java +++ b/src/main/java/net/minecraftforge/resource/ResourcePackLoader.java @@ -79,7 +79,7 @@ public class ResourcePackLoader { private static void findPacks(Consumer packAcceptor, boolean client) { var type = client ? PackType.CLIENT_RESOURCES : PackType.SERVER_DATA; - var version = DetectedVersion.BUILT_IN.packVersion(PackType.CLIENT_RESOURCES); + var version = DetectedVersion.BUILT_IN.packVersion(type); var hiddenPacks = new ArrayList(); for (var mod : ModList.get().getModFiles()) {