94 lines
4.8 KiB
Diff
94 lines
4.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Spottedleaf <spottedleaf@spottedleaf.dev>
|
|
Date: Fri, 24 Jul 2020 15:56:05 -0700
|
|
Subject: [PATCH] Fix some rails connecting improperly
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/block/BaseRailBlock.java b/src/main/java/net/minecraft/world/level/block/BaseRailBlock.java
|
|
index 41c23abf78c2ca95c26633860adb9360139b3ceb..1242eb55996bca8a63bd7b95d01d0299fb36d105 100644
|
|
--- a/src/main/java/net/minecraft/world/level/block/BaseRailBlock.java
|
|
+++ b/src/main/java/net/minecraft/world/level/block/BaseRailBlock.java
|
|
@@ -65,6 +65,7 @@ public abstract class BaseRailBlock extends Block implements SimpleWaterloggedBl
|
|
state = this.updateDir(world, pos, state, true);
|
|
if (this.isStraight) {
|
|
state.neighborChanged(world, pos, this, pos, notify);
|
|
+ state = world.getBlockState(pos); // Paper - don't desync, update again
|
|
}
|
|
|
|
return state;
|
|
diff --git a/src/main/java/net/minecraft/world/level/block/DetectorRailBlock.java b/src/main/java/net/minecraft/world/level/block/DetectorRailBlock.java
|
|
index 2335e7af6bc16a0d65c7818c316f3194c680c69d..63c7f2cf530ac9562960ae5a3cbc6e511a009377 100644
|
|
--- a/src/main/java/net/minecraft/world/level/block/DetectorRailBlock.java
|
|
+++ b/src/main/java/net/minecraft/world/level/block/DetectorRailBlock.java
|
|
@@ -70,6 +70,7 @@ public class DetectorRailBlock extends BaseRailBlock {
|
|
|
|
private void checkPressed(Level world, BlockPos pos, BlockState state) {
|
|
if (this.canSurvive(state, world, pos)) {
|
|
+ if (state.getBlock() != this) { return; } // Paper - not our block, don't do anything
|
|
boolean flag = (Boolean) state.getValue(DetectorRailBlock.POWERED);
|
|
boolean flag1 = false;
|
|
List<AbstractMinecart> list = this.getInteractingMinecartOfType(world, pos, AbstractMinecart.class, (entity) -> {
|
|
diff --git a/src/main/java/net/minecraft/world/level/block/RailState.java b/src/main/java/net/minecraft/world/level/block/RailState.java
|
|
index a205e04bce8706302e4a077646749d05dee98251..0f24187dc3f1340d142f88cbac64c4f5c333e5b8 100644
|
|
--- a/src/main/java/net/minecraft/world/level/block/RailState.java
|
|
+++ b/src/main/java/net/minecraft/world/level/block/RailState.java
|
|
@@ -10,13 +10,19 @@ import net.minecraft.world.level.block.state.BlockState;
|
|
import net.minecraft.world.level.block.state.properties.RailShape;
|
|
|
|
public class RailState {
|
|
- private final Level level;
|
|
- private final BlockPos pos;
|
|
+ private final Level level; public final Level getWorld() { return this.level; } // Paper - OBFHELPER
|
|
+ private final BlockPos pos; public final BlockPos getPos() { return this.pos; } // Paper - OBFHELPER
|
|
private final BaseRailBlock block;
|
|
- private BlockState state;
|
|
+ private BlockState state; public final BlockState getRailState() { return this.state; } // Paper - OBFHELPER
|
|
private final boolean isStraight;
|
|
private final List<BlockPos> connections = Lists.newArrayList();
|
|
|
|
+ // Paper start - prevent desync
|
|
+ public boolean isValid() {
|
|
+ return this.getWorld().getBlockState(this.getPos()).getBlock() == this.getRailState().getBlock();
|
|
+ }
|
|
+ // Paper end - prevent desync
|
|
+
|
|
public RailState(Level world, BlockPos pos, BlockState state) {
|
|
this.level = world;
|
|
this.pos = pos;
|
|
@@ -143,6 +149,11 @@ public class RailState {
|
|
}
|
|
|
|
private void connectTo(RailState placementHelper) {
|
|
+ // Paper start - prevent desync
|
|
+ if (!this.isValid() || !placementHelper.isValid()) {
|
|
+ return;
|
|
+ }
|
|
+ // Paper end - prevent desync
|
|
this.connections.add(placementHelper.pos);
|
|
BlockPos blockPos = this.pos.north();
|
|
BlockPos blockPos2 = this.pos.south();
|
|
@@ -333,10 +344,15 @@ public class RailState {
|
|
this.state = this.state.setValue(this.block.getShapeProperty(), railShape2);
|
|
if (forceUpdate || this.level.getBlockState(this.pos) != this.state) {
|
|
this.level.setBlock(this.pos, this.state, 3);
|
|
+ // Paper start - prevent desync
|
|
+ if (!this.isValid()) {
|
|
+ return this;
|
|
+ }
|
|
+ // Paper end - prevent desync
|
|
|
|
for(int i = 0; i < this.connections.size(); ++i) {
|
|
RailState railState = this.getRail(this.connections.get(i));
|
|
- if (railState != null) {
|
|
+ if (railState != null && railState.isValid()) { // Paper - prevent desync
|
|
railState.removeSoftConnections();
|
|
if (railState.canConnectTo(this)) {
|
|
railState.connectTo(this);
|
|
@@ -349,6 +365,6 @@ public class RailState {
|
|
}
|
|
|
|
public BlockState getState() {
|
|
- return this.state;
|
|
+ return this.getWorld().getBlockState(this.getPos()); // Paper - prevent desync
|
|
}
|
|
}
|