Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +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:
9788250b1 Clean up a lot of obfuscation helpers and impls
58a745eba Fix scoreboard vanilla colors not working in chat
This commit is contained in:
William Blake Galbreath
2020-08-04 16:08:06 -05:00
parent 3bbbdfb092
commit 83d82e5cf3
15 changed files with 114 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/server/0058-Controllable-Minecarts.patch
View File

@@ -5,12 +5,12 @@ Subject: [PATCH] Controllable Minecarts
diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
index 7ff4948a4..82f3f275d 100644
index 7bdefff433..a90ade6897 100644
--- a/src/main/java/net/minecraft/server/BlockPosition.java
+++ b/src/main/java/net/minecraft/server/BlockPosition.java
@@ -33,6 +33,12 @@ public class BlockPosition extends BaseBlockPosition {
private static final int l = BlockPosition.h;
private static final int m = BlockPosition.h + BlockPosition.g;
@@ -35,6 +35,12 @@ public class BlockPosition extends BaseBlockPosition {
private static final int m = 38;
// Paper end
+ // Purpur start
+ public BlockPosition(Entity entity) {
@@ -22,7 +22,7 @@ index 7ff4948a4..82f3f275d 100644
super(i, j, k);
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 653071979..581b50a0f 100644
index 85899e385a..efb997bcf3 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -98,9 +98,9 @@ public abstract class EntityLiving extends Entity {
@@ -39,7 +39,7 @@ index 653071979..581b50a0f 100644
protected double bc;
protected double bd;
diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
index 6e038905e..cdbe1a32e 100644
index 6e038905ea..cdbe1a32e0 100644
--- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
@@ -432,12 +432,50 @@ public abstract class EntityMinecartAbstract extends Entity {
@@ -94,7 +94,7 @@ index 6e038905e..cdbe1a32e 100644
this.setMot(new Vec3D(this.getMot().x * this.derailedX, this.getMot().y * this.derailedY, this.getMot().z * this.derailedZ));
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/ItemMinecart.java b/src/main/java/net/minecraft/server/ItemMinecart.java
index dc7decb06..0da16c200 100644
index dc7decb060..0da16c2006 100644
--- a/src/main/java/net/minecraft/server/ItemMinecart.java
+++ b/src/main/java/net/minecraft/server/ItemMinecart.java
@@ -103,8 +103,10 @@ public class ItemMinecart extends Item {
@@ -119,7 +119,7 @@ index dc7decb06..0da16c200 100644
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 70e504ff3..276131adc 100644
index 70e504ff30..276131adc7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1,5 +1,7 @@