Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 08:57:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
d62bab6e Add a missing return in Eigencraft redstone (#4621)
This commit is contained in:
William Blake Galbreath
2020-10-05 11:27:58 -05:00
parent d23a158fa5
commit 8295d22ee3
3 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: 5234e6e242...d62bab6e25

2
current-paper
View File

@@ -1 +1 @@
1.16.3--a692b28ba241d4cc060e7af7096994c7e06fd525 1.16.3--1ab7b4eb563f1025700ccba92b574ed7b450062e

16
patches/server/0001-Tuinity-Server-Changes.patch
View File

@@ -2287,18 +2287,6 @@ index 2d887af902..2291135eae 100644
@Override @Override
public BlockPosition immutableCopy() { public BlockPosition immutableCopy() {
diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
index 6abc3d4cfb..a8ef41dcf5 100644
--- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java
+++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
@@ -226,6 +226,7 @@ public class BlockRedstoneWire extends Block {
private void updateSurroundingRedstone(World worldIn, BlockPosition pos, IBlockData state, BlockPosition source) {
if (worldIn.paperConfig.useEigencraftRedstone) {
turbo.updateSurroundingRedstone(worldIn, pos, state, source);
+ return; // Tuinity - Don't run old logic as well
}
a(worldIn, pos, state);
}
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 299d7d7a55..ac6e5e3309 100644 index 299d7d7a55..ac6e5e3309 100644
--- a/src/main/java/net/minecraft/server/Chunk.java --- a/src/main/java/net/minecraft/server/Chunk.java
@@ -3156,7 +3144,7 @@ index 550232cb38..229c3b0f0c 100644
throwable = throwable1; throwable = throwable1;
throw throwable1; throw throwable1;
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index ebdbbeb1b5..6bc0299d15 100644 index 28e2d3f0a5..e03635d415 100644
--- a/src/main/java/net/minecraft/server/Entity.java --- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -136,7 +136,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -136,7 +136,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -7351,7 +7339,7 @@ index 7591159c25..e5c3e5765c 100644
public IBlockData getState() { public IBlockData getState() {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 6ceb2d50c5..407c03408a 100644 index 6f59f8d454..704d000001 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -501,27 +501,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -501,27 +501,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {