Merge pull request #2116 from stellanera98/1.20-onjump-fix

wrincewind · web-flow · commit 04ef40f69be5 · 2025-11-04T23:47:58.000Z
potentially fix random crash with living armour
diff --git a/src/main/java/wayoftime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/wayoftime/bloodmagic/util/handler/event/GenericHandler.java
@@ -943,7 +943,7 @@ public void onJump(LivingJumpEvent event)
 				LivingUtil.applyNewExperience(player, LivingArmorRegistrar.UPGRADE_JUMP.get(), 1);
 				if (!player.isShiftKeyDown())
 				{
-					LivingStats stats = LivingStats.fromPlayer(player);
+					LivingStats stats = LivingStats.fromPlayer(player, true);
 					double jumpModifier = LivingArmorRegistrar.UPGRADE_JUMP.get().getBonusValue("jump", stats.getLevel(LivingArmorRegistrar.UPGRADE_JUMP.get().getKey())).doubleValue();
 					player.setDeltaMovement(player.getDeltaMovement().add(0, jumpModifier, 0));
 				}

Original file line number	Diff line number	Diff line change
`@@ -943,7 +943,7 @@ public void onJump(LivingJumpEvent event)`
`943`	`943`	`LivingUtil.applyNewExperience(player, LivingArmorRegistrar.UPGRADE_JUMP.get(), 1);`
`944`	`944`	`if (!player.isShiftKeyDown())`
`945`	`945`	`{`
`946`		`- LivingStats stats = LivingStats.fromPlayer(player);`
	`946`	`+ LivingStats stats = LivingStats.fromPlayer(player, true);`
`947`	`947`	`double jumpModifier = LivingArmorRegistrar.UPGRADE_JUMP.get().getBonusValue("jump", stats.getLevel(LivingArmorRegistrar.UPGRADE_JUMP.get().getKey())).doubleValue();`
`948`	`948`	`player.setDeltaMovement(player.getDeltaMovement().add(0, jumpModifier, 0));`
`949`	`949`	`}`