Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 01:47: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:
97f920bf Fix suggest-player-names-when-null-tab-completions - Fixes #3803
166e52b5 [CI-SKIP] [Auto] Rebuild Patches
5a17ba07 Implements #3761 - Add entity liquid API (#3762)
e0cae289 Fix anvils bug - Fixes #3802
4793f774 Move bedrock config under unsupported, add comments to these configs
adf1de58 Allow delegation to vanilla chunk gen
40ace3f7 Allow delegation to vanilla chunk gen
178a6e50 Add PrepareResultEvent (#3776)
57697cd5 Report proxy onlinde mode to bstats as online (#3093)
6579ce05 Fix #3701 - Loottables erasing on viewing
030da7b8 [CI-SKIP] [Auto] Rebuild Patches
d43def79 Incorrect spawn reason for monsters from spawner - Fixes #3708 (#3764)
97b59df9 [Auto] Updated Upstream (CraftBukkit)
0543f051 [CI-SKIP] [Auto] Rebuild Patches
f3cd94c4 Remove streams from classes related to villager gossip (#3748)
b49104db add EntityTargetLivingEntityEvent for new 1.16 mobs (#3782)
4faf9703 Fix /plugins list not alphabetical to players (#3790)
7e03e44e [CI-SKIP] [Auto] Rebuild Patches
8bb00272 Update itemstack legacy name and lore (#3741)
6c87b6a0 [Auto] Updated Upstream (CraftBukkit)
This commit is contained in:
William Blake Galbreath
2020-07-05 02:45:06 -05:00
parent d337d76150
commit 329fb0f5ce
31 changed files with 203 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/server/0059-Controllable-Minecarts.patch
View File

@@ -5,7 +5,7 @@ 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 551ca4471..32757e231 100644
index 551ca4471f..32757e2318 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 {
@@ -21,20 +21,8 @@ index 551ca4471..32757e231 100644
public BlockPosition(int i, int j, int k) {
super(i, j, k);
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index a6105d8c8..5b3f287c8 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1473,6 +1473,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.inLava = true;
}
+ public boolean isInLava() { return aN(); } // Purpur - OBFHELPER
public boolean aN() {
return this.inLava;
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index dd894c7ea..bf8be6012 100644
index dd894c7eab..bf8be60124 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 {
@@ -51,7 +39,7 @@ index dd894c7ea..bf8be6012 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 {
@@ -106,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 {
@@ -131,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 @@