Skip to content

Fix setting invalid direction state prop in UpgradeData #7781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Machine-Maker wants to merge 1 commit into from
Closed

Fix setting invalid direction state prop in UpgradeData #7781

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions patches/server/0920-Fix-setting-invalid-direction-state-prop-in-UpgradeD.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Sun, 24 Apr 2022 11:07:21 -0700
Subject: [PATCH] Fix setting invalid direction state prop in UpgradeData


diff --git a/src/main/java/net/minecraft/world/level/chunk/UpgradeData.java b/src/main/java/net/minecraft/world/level/chunk/UpgradeData.java
index 8c68f95d78909e6fe7dd4b6025af5d958b122f28..20b11d62976c79829d8cbb9a988a543b15260e21 100644
--- a/src/main/java/net/minecraft/world/level/chunk/UpgradeData.java
+++ b/src/main/java/net/minecraft/world/level/chunk/UpgradeData.java
@@ -357,7 +357,7 @@ public class UpgradeData {
STEM_BLOCK(Blocks.MELON_STEM, Blocks.PUMPKIN_STEM) {
@Override
public BlockState updateShape(BlockState oldState, Direction direction, BlockState otherState, LevelAccessor world, BlockPos currentPos, BlockPos otherPos) {
- if (oldState.getValue(StemBlock.AGE) == 7) {
+ if (direction.getAxis().isHorizontal() && oldState.getValue(StemBlock.AGE) == 7) { // Paper
StemGrownBlock stemGrownBlock = ((StemBlock)oldState.getBlock()).getFruit();
if (otherState.is(stemGrownBlock)) {
return stemGrownBlock.getAttachedStem().defaultBlockState().setValue(HorizontalDirectionalBlock.FACING, direction);