Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +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:
33a615de Add option to nerf pigmen from nether portals (#2937)
125a517d Update upstream CB
This commit is contained in:
William Blake Galbreath
2020-02-18 20:13:10 -06:00
parent 9e073631de
commit c98e91e6e3
9 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: df0d7b0d5c...33a615de43

2
current-paper
View File

@@ -1 +1 @@
1.15.2--f2dd6bbbd577228dc95225f66d44f5fd5e90b3e1
1.15.2--f20b19ba4b0cc8ab294f945faebf1a61ad9264a7

14
patches/server/0003-Ridables.patch
View File

@@ -1,4 +1,4 @@
From 3474d5f429c81085846778662112ce25f0824d74 Mon Sep 17 00:00:00 2001
From 0726d8c0f7c9b3e40fe342597c09c6d6f3e9c14d Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 6 Feb 2020 19:53:59 -0600
Subject: [PATCH] Ridables
@@ -142,7 +142,7 @@ index a5c4cbb67..efe6afde9 100644
public ControllerMove(EntityInsentient entityinsentient) {
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index acb7848d8..37c1c519b 100644
index a855d743a..c60d13b89 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -78,7 +78,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -172,7 +172,7 @@ index acb7848d8..37c1c519b 100644
public boolean noclip;
public float J;
protected final Random random;
@@ -2108,7 +2108,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2115,7 +2115,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
} else {
this.passengers.add(entity);
}
@@ -187,7 +187,7 @@ index acb7848d8..37c1c519b 100644
}
return true; // CraftBukkit
}
@@ -2143,6 +2149,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2150,6 +2156,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}
// Spigot end
@@ -200,7 +200,7 @@ index acb7848d8..37c1c519b 100644
this.passengers.remove(entity);
entity.j = 60;
}
@@ -2529,6 +2541,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2536,6 +2548,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
public void setHeadRotation(float f) {}
@@ -208,7 +208,7 @@ index acb7848d8..37c1c519b 100644
public void l(float f) {}
public boolean bA() {
@@ -3374,4 +3387,43 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3381,4 +3394,43 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
void accept(Entity entity, double d0, double d1, double d2);
}
@@ -1976,7 +1976,7 @@ index 81b7cd06f..3e6722cfc 100644
this.targetSelector.a(2, (new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true)).a(300));
this.targetSelector.a(3, (new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false)).a(300));
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index e54f1e840..b25ebcfd9 100644
index 2cee73ace..f0ef48bb1 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -28,7 +28,7 @@ public abstract class EntityInsentient extends EntityLiving {

8
patches/server/0015-Cows-eat-mushrooms.patch
View File

@@ -1,4 +1,4 @@
From 9a89bf6455593f02b131d6c073cdbec5177e7831 Mon Sep 17 00:00:00 2001
From 40f87fd6f38438e9c7c65400898ce7a10dd05d99 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 4 May 2019 01:10:30 -0500
Subject: [PATCH] Cows eat mushrooms
@@ -11,10 +11,10 @@ Subject: [PATCH] Cows eat mushrooms
4 files changed, 77 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 37c1c519b..b18e9ae50 100644
index c60d13b89..21b2ff8f8 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1037,6 +1037,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1039,6 +1039,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}
@@ -22,7 +22,7 @@ index 37c1c519b..b18e9ae50 100644
public void a(SoundEffect soundeffect, float f, float f1) {
if (!this.isSilent()) {
this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), soundeffect, this.getSoundCategory(), f, f1);
@@ -2568,6 +2569,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2575,6 +2576,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.invulnerable = flag;
}

8
patches/server/0020-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
View File

@@ -1,4 +1,4 @@
From a341be6ed4dab4a60a860326bd324add34e99534 Mon Sep 17 00:00:00 2001
From 9f4b6367abc909f929ccfc97910c222bd8530e64 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 9 May 2019 18:26:06 -0500
Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
@@ -25,10 +25,10 @@ index 816d301f1..0971f25b5 100644
return (new EntityDamageSourceIndirect("indirectMagic", entity, entity1)).setIgnoreArmor().setMagic();
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index b18e9ae50..c6a97d6b5 100644
index 21b2ff8f8..1d967ad6a 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1380,6 +1380,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1382,6 +1382,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return d3 * d3 + d4 * d4 + d5 * d5;
}
@@ -36,7 +36,7 @@ index b18e9ae50..c6a97d6b5 100644
public double h(Entity entity) {
return this.c(entity.getPositionVector());
}
@@ -1899,14 +1900,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1906,14 +1907,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.a(new ItemStack(imaterial), (float) i);
}

6
patches/server/0029-Controllable-Minecarts.patch
View File

@@ -1,4 +1,4 @@
From 4d9591706edfc7b7ce94d265820bc3903e56fa0c Mon Sep 17 00:00:00 2001
From 2fb71d7e5e44b1dc97c87e37078484a6aa887873 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 29 Jun 2019 02:32:40 -0500
Subject: [PATCH] Controllable Minecarts
@@ -11,10 +11,10 @@ Subject: [PATCH] Controllable Minecarts
4 files changed, 82 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index c6a97d6b5..dbd7236d8 100644
index 1d967ad6a..2bbdb994a 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1282,6 +1282,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1284,6 +1284,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.inLava = true;
}

6
patches/server/0039-Implement-AFK-API.patch
View File

@@ -1,4 +1,4 @@
From 50380a3f922e7c37c0840a1ee205c5b76cea0fd7 Mon Sep 17 00:00:00 2001
From 6c10cda1f0c2485eaa03e7695c99980f8f92dd3b Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 8 Aug 2019 15:29:15 -0500
Subject: [PATCH] Implement AFK API
@@ -17,10 +17,10 @@ Subject: [PATCH] Implement AFK API
10 files changed, 112 insertions(+), 24 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index dbd7236d8..a2fe1a424 100644
index 2bbdb994a..3e5dd4362 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1373,6 +1373,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1375,6 +1375,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return MathHelper.c(f * f + f1 * f1 + f2 * f2);
}

22
patches/server/0046-Add-EntityPortalReadyEvent.patch
View File

@@ -1,4 +1,4 @@
From 92f64802ef183824cb3232e402b9744e080915aa Mon Sep 17 00:00:00 2001
From b0b0cad4048e31429191654fdce85c7b88e7dc24 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 11 Jan 2020 23:12:52 -0600
Subject: [PATCH] Add EntityPortalReadyEvent
@@ -11,10 +11,10 @@ Subject: [PATCH] Add EntityPortalReadyEvent
4 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/src/main/java/net/minecraft/server/BlockPortal.java b/src/main/java/net/minecraft/server/BlockPortal.java
index 2dc3ab4cf..1c0df77c2 100644
index 5e3ac055d..35c162a90 100644
--- a/src/main/java/net/minecraft/server/BlockPortal.java
+++ b/src/main/java/net/minecraft/server/BlockPortal.java
@@ -52,6 +52,7 @@ public class BlockPortal extends Block {
@@ -54,6 +54,7 @@ public class BlockPortal extends Block {
}
@@ -22,7 +22,7 @@ index 2dc3ab4cf..1c0df77c2 100644
public boolean a(GeneratorAccess generatoraccess, BlockPosition blockposition) {
BlockPortal.Shape blockportal_shape = this.b(generatoraccess, blockposition);
@@ -65,8 +66,8 @@ public class BlockPortal extends Block {
@@ -67,8 +68,8 @@ public class BlockPortal extends Block {
}
}
@@ -33,7 +33,7 @@ index 2dc3ab4cf..1c0df77c2 100644
BlockPortal.Shape blockportal_shape = new BlockPortal.Shape(generatoraccess, blockposition, EnumDirection.EnumAxis.X);
if (blockportal_shape.d() && blockportal_shape.e == 0) {
@@ -187,6 +188,7 @@ public class BlockPortal extends Block {
@@ -189,6 +190,7 @@ public class BlockPortal extends Block {
private int height;
private int width;
java.util.List<org.bukkit.block.BlockState> blocks = new java.util.ArrayList<org.bukkit.block.BlockState>(); // CraftBukkit - add field
@@ -41,7 +41,7 @@ index 2dc3ab4cf..1c0df77c2 100644
public Shape(GeneratorAccess generatoraccess, BlockPosition blockposition, EnumDirection.EnumAxis enumdirection_enumaxis) {
this.a = generatoraccess;
@@ -226,14 +228,14 @@ public class BlockPortal extends Block {
@@ -228,14 +230,14 @@ public class BlockPortal extends Block {
for (i = 0; i < 22; ++i) {
BlockPosition blockposition1 = blockposition.shift(enumdirection, i);
@@ -58,7 +58,7 @@ index 2dc3ab4cf..1c0df77c2 100644
}
public int a() {
@@ -268,7 +270,7 @@ public class BlockPortal extends Block {
@@ -270,7 +272,7 @@ public class BlockPortal extends Block {
if (i == 0) {
block = this.a.getType(blockposition.shift(this.d)).getBlock();
@@ -67,7 +67,7 @@ index 2dc3ab4cf..1c0df77c2 100644
break label56;
// CraftBukkit start - add the block to our list
} else {
@@ -278,7 +280,7 @@ public class BlockPortal extends Block {
@@ -280,7 +282,7 @@ public class BlockPortal extends Block {
}
} else if (i == this.width - 1) {
block = this.a.getType(blockposition.shift(this.c)).getBlock();
@@ -76,7 +76,7 @@ index 2dc3ab4cf..1c0df77c2 100644
break label56;
// CraftBukkit start - add the block to our list
} else {
@@ -291,7 +293,7 @@ public class BlockPortal extends Block {
@@ -293,7 +295,7 @@ public class BlockPortal extends Block {
}
for (i = 0; i < this.width; ++i) {
@@ -86,7 +86,7 @@ index 2dc3ab4cf..1c0df77c2 100644
break;
// CraftBukkit start - add the block to our list
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index a2fe1a424..fc9d288de 100644
index 3e5dd4362..43237a3d5 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -168,9 +168,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -102,7 +102,7 @@ index a2fe1a424..fc9d288de 100644
private boolean invulnerable;
protected UUID uniqueID;
protected String am;
@@ -2210,6 +2210,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2217,6 +2217,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.world.getMethodProfiler().enter("portal");
this.ag = i;
this.portalCooldown = this.ba();

8
patches/server/0054-Ladders-should-not-bypass-cramming-gamerule.patch
View File

@@ -1,4 +1,4 @@
From 012a9451e731df4d43d74a8547f410d7fb47e495 Mon Sep 17 00:00:00 2001
From bca5f5b7136fe3f704830acd61a9d432479d4ce8 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 21 Jul 2019 18:06:20 -0500
Subject: [PATCH] Ladders should not bypass cramming gamerule
@@ -17,10 +17,10 @@ Subject: [PATCH] Ladders should not bypass cramming gamerule
10 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index fc9d288de..4ecfba81a 100644
index 43237a3d5..8ad20994b 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1508,6 +1508,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1510,6 +1510,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
public boolean isCollidable() {
@@ -112,7 +112,7 @@ index d64e02628..cd4526039 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
index 57288aa73..7d6554700 100644
index 1f3e5bd28..ae4758f25 100644
--- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
@@ -105,7 +105,7 @@ public abstract class EntityMinecartAbstract extends Entity {