Updated Upstream (CraftBukkit/Spigot)
Doesn't compile yet. CraftBukkit Changes: 90d6905b Repackage NMS 69cf961d Repackage patches Spigot Changes: 79d53c28 Repackage NMS
This commit is contained in:
@@ -4,10 +4,10 @@ Date: Fri, 24 Jul 2020 15:56:05 -0700
|
||||
Subject: [PATCH] Fix some rails connecting improperly
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/BlockMinecartDetector.java b/src/main/java/net/minecraft/server/BlockMinecartDetector.java
|
||||
diff --git a/src/main/java/net/minecraft/world/level/block/BlockMinecartDetector.java b/src/main/java/net/minecraft/world/level/block/BlockMinecartDetector.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/net/minecraft/server/BlockMinecartDetector.java
|
||||
+++ b/src/main/java/net/minecraft/server/BlockMinecartDetector.java
|
||||
--- a/src/main/java/net/minecraft/world/level/block/BlockMinecartDetector.java
|
||||
+++ b/src/main/java/net/minecraft/world/level/block/BlockMinecartDetector.java
|
||||
@@ -0,0 +0,0 @@ public class BlockMinecartDetector extends BlockMinecartTrackAbstract {
|
||||
|
||||
private void a(World world, BlockPosition blockposition, IBlockData iblockdata) {
|
||||
@@ -16,10 +16,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
boolean flag = (Boolean) iblockdata.get(BlockMinecartDetector.POWERED);
|
||||
boolean flag1 = false;
|
||||
List<EntityMinecartAbstract> list = this.a(world, blockposition, EntityMinecartAbstract.class, (Predicate) null);
|
||||
diff --git a/src/main/java/net/minecraft/server/BlockMinecartTrackAbstract.java b/src/main/java/net/minecraft/server/BlockMinecartTrackAbstract.java
|
||||
diff --git a/src/main/java/net/minecraft/world/level/block/BlockMinecartTrackAbstract.java b/src/main/java/net/minecraft/world/level/block/BlockMinecartTrackAbstract.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/net/minecraft/server/BlockMinecartTrackAbstract.java
|
||||
+++ b/src/main/java/net/minecraft/server/BlockMinecartTrackAbstract.java
|
||||
--- a/src/main/java/net/minecraft/world/level/block/BlockMinecartTrackAbstract.java
|
||||
+++ b/src/main/java/net/minecraft/world/level/block/BlockMinecartTrackAbstract.java
|
||||
@@ -0,0 +0,0 @@ public abstract class BlockMinecartTrackAbstract extends Block {
|
||||
iblockdata = this.a(world, blockposition, iblockdata, true);
|
||||
if (this.c) {
|
||||
@@ -28,11 +28,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
}
|
||||
|
||||
return iblockdata;
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecartTrackLogic.java b/src/main/java/net/minecraft/server/MinecartTrackLogic.java
|
||||
diff --git a/src/main/java/net/minecraft/world/level/block/MinecartTrackLogic.java b/src/main/java/net/minecraft/world/level/block/MinecartTrackLogic.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecartTrackLogic.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecartTrackLogic.java
|
||||
@@ -0,0 +0,0 @@ import javax.annotation.Nullable;
|
||||
--- a/src/main/java/net/minecraft/world/level/block/MinecartTrackLogic.java
|
||||
+++ b/src/main/java/net/minecraft/world/level/block/MinecartTrackLogic.java
|
||||
@@ -0,0 +0,0 @@ import net.minecraft.world.level.block.state.properties.BlockPropertyTrackPositi
|
||||
|
||||
public class MinecartTrackLogic {
|
||||
|
||||
|
||||
Reference in New Issue
Block a user