Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 09:57: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:
7329e19c Updated Upstream (CraftBukkit)
b3a97d14 Fix startup errors when double clicking jar (#2903)
b51fbefc Revert "Fix errors on startup when double clicking jar (#2901)"
a0438fab Fix errors on startup when double clicking jar (#2901)
e0da6d4b Seed based feature search (Fixes #2312) (#2852)
78dfb77e Updated Upstream (Bukkit/CraftBukkit)
969ef51a Init legacy material data
c4714909 Fix items vanishing through end portal (Resolves #2681) (#2894)
74b0ef39 Updated Upstream (CraftBukkit)
This commit is contained in:
William Blake Galbreath
2020-01-25 02:35:47 -06:00
parent 0118e083d1
commit 8f99ddb050
8 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: 8a0b371c68...7329e19ce5

2
current-paper
View File

@@ -1 +1 @@
1.15.2--5c4898000727433664dd042a874d6d29b05f5a38 1.15.2--833bebdb4653f254bf9680765742a5ebfbf2831b

6
patches/server/0001-Rebrand.patch
View File

@@ -1,4 +1,4 @@
From 56a276c134cd6770a63b90cf1f8b049fedf6f7de Mon Sep 17 00:00:00 2001 From 0f5433bc7ea1fc537ab605d06e3ddad2cf44984e Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 4 May 2019 01:02:11 -0500 Date: Sat, 4 May 2019 01:02:11 -0500
Subject: [PATCH] Rebrand Subject: [PATCH] Rebrand
@@ -233,10 +233,10 @@ index ee5c57ca2..55b849237 100644
private final String bukkitVersion = Versioning.getBukkitVersion(); private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft"); private final Logger logger = Logger.getLogger("Minecraft");
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 6a6e4fe48..bd384024f 100644 index 8d93ad6b4..e9942016b 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -298,7 +298,7 @@ public final class CraftMagicNumbers implements UnsafeValues { @@ -299,7 +299,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@Override @Override
public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() { public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {

8
patches/server/0010-Integrate-ridables.patch
View File

@@ -1,4 +1,4 @@
From fb26e478e18ba7a028d1655ddc8a37a85621e512 Mon Sep 17 00:00:00 2001 From 2223402187e9fa667b32ad7d1b564a22842d7a7d Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 30 Apr 2019 19:17:21 -0500 Date: Tue, 30 Apr 2019 19:17:21 -0500
Subject: [PATCH] Integrate ridables Subject: [PATCH] Integrate ridables
@@ -116,7 +116,7 @@ index 1d9ba04da..2bade947e 100644
this.d = false; this.d = false;
this.a.aK = this.a(this.a.aK, this.h() + 20.0F, this.b); this.a.aK = this.a(this.a.aK, this.h() + 20.0F, this.b);
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 863ff08fd..bdee6efe6 100644 index 941bebcac..f5b4c7e3c 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
@@ -79,6 +79,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -79,6 +79,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -176,7 +176,7 @@ index 863ff08fd..bdee6efe6 100644
this.passengers.remove(entity); this.passengers.remove(entity);
entity.j = 60; entity.j = 60;
} }
@@ -3370,4 +3385,21 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -3375,4 +3390,21 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
void accept(Entity entity, double d0, double d1, double d2); void accept(Entity entity, double d0, double d1, double d2);
} }
@@ -1317,7 +1317,7 @@ index 5782a25ec..dbe022340 100644
+ // Purpur end + // Purpur end
} }
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 2edb99b63..d5e8831f1 100644 index 584166f22..de22cad76 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java --- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -374,9 +374,21 @@ public abstract class EntityHuman extends EntityLiving { @@ -374,9 +374,21 @@ public abstract class EntityHuman extends EntityLiving {

8
patches/server/0027-Controllable-Minecarts.patch
View File

@@ -1,4 +1,4 @@
From 327f2130ddb69565f47048e2df5af0ff9d8eeddc Mon Sep 17 00:00:00 2001 From 9b406ca83d65b05cdc393d3e267b0c09837bc877 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 29 Jun 2019 02:32:40 -0500 Date: Sat, 29 Jun 2019 02:32:40 -0500
Subject: [PATCH] Controllable Minecarts Subject: [PATCH] Controllable Minecarts
@@ -11,7 +11,7 @@ Subject: [PATCH] Controllable Minecarts
4 files changed, 75 insertions(+), 3 deletions(-) 4 files changed, 75 insertions(+), 3 deletions(-)
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 bdee6efe6..5a5531c10 100644 index f5b4c7e3c..6ea10fb56 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
@@ -1284,6 +1284,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -1284,6 +1284,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -23,7 +23,7 @@ index bdee6efe6..5a5531c10 100644
return this.inLava; return this.inLava;
} }
diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
index 4388186db..5abd8a181 100644 index 665bbe07f..1b982a510 100644
--- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
@@ -8,6 +8,7 @@ import java.util.List; @@ -8,6 +8,7 @@ import java.util.List;
@@ -34,7 +34,7 @@ index 4388186db..5abd8a181 100644
// CraftBukkit start // CraftBukkit start
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.entity.Vehicle; import org.bukkit.entity.Vehicle;
@@ -355,12 +356,50 @@ public abstract class EntityMinecartAbstract extends Entity { @@ -357,12 +358,50 @@ public abstract class EntityMinecartAbstract extends Entity {
public void a(int i, int j, int k, boolean flag) {} public void a(int i, int j, int k, boolean flag) {}

8
patches/server/0059-Add-option-for-boats-to-eject-players-on-land.patch
View File

@@ -1,4 +1,4 @@
From 877f9dfcb737f543b84fb49c12f7ddcb390d6f08 Mon Sep 17 00:00:00 2001 From 9088e3e2ea32fb54c89c4c66fd0d99411add6d90 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 7 Sep 2019 22:47:59 -0500 Date: Sat, 7 Sep 2019 22:47:59 -0500
Subject: [PATCH] Add option for boats to eject players on land Subject: [PATCH] Add option for boats to eject players on land
@@ -9,10 +9,10 @@ Subject: [PATCH] Add option for boats to eject players on land
2 files changed, 6 insertions(+) 2 files changed, 6 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
index 03624bbd6a..36969eeb2b 100644 index 563fc8ced..479ed7c7b 100644
--- a/src/main/java/net/minecraft/server/EntityBoat.java --- a/src/main/java/net/minecraft/server/EntityBoat.java
+++ b/src/main/java/net/minecraft/server/EntityBoat.java +++ b/src/main/java/net/minecraft/server/EntityBoat.java
@@ -427,6 +427,7 @@ public class EntityBoat extends Entity { @@ -431,6 +431,7 @@ public class EntityBoat extends Entity {
if (f > 0.0F) { if (f > 0.0F) {
this.aE = f; this.aE = f;
@@ -21,7 +21,7 @@ index 03624bbd6a..36969eeb2b 100644
} else { } else {
return EntityBoat.EnumStatus.IN_AIR; return EntityBoat.EnumStatus.IN_AIR;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 38d85c6389..b2c62de053 100644 index 38d85c638..b2c62de05 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -70,6 +70,11 @@ public class PurpurWorldConfig { @@ -70,6 +70,11 @@ public class PurpurWorldConfig {

8
patches/server/0087-Make-the-GUI-better.patch
View File

@@ -1,4 +1,4 @@
From ccac65fb797842f093e4f04c6750152a193afeaf Mon Sep 17 00:00:00 2001 From 18b9102c49cd9cf5d273bca99ea956b79baa31eb Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com> From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 16 Jan 2020 14:59:16 -0600 Date: Thu, 16 Jan 2020 14:59:16 -0600
Subject: [PATCH] Make the GUI better Subject: [PATCH] Make the GUI better
@@ -793,7 +793,7 @@ index 000000000..c4519794c
+ } + }
+} +}
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index 869bff4af..2a3e57c2f 100644 index a9bb98765..707ade70a 100644
--- a/src/main/resources/log4j2.xml --- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml
@@ -2,7 +2,16 @@ @@ -2,7 +2,16 @@
@@ -812,8 +812,8 @@ index 869bff4af..2a3e57c2f 100644
+ </PatternLayout> + </PatternLayout>
+ <!-- Purpur end --> + <!-- Purpur end -->
</Queue> </Queue>
<Queue name="TerminalConsole"> <TerminalConsole name="TerminalConsole">
<PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg%n" /> <PatternLayout>
-- --
2.24.0 2.24.0

6
patches/server/0091-Add-player-death-exp-control-options.patch
View File

@@ -1,4 +1,4 @@
From f6ead952367f2367164bdf5592a8957f4c267827 Mon Sep 17 00:00:00 2001 From d0783acf1d4f859da0f39bd0f9c36fa502734160 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com> From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 26 Dec 2019 22:08:37 -0600 Date: Thu, 26 Dec 2019 22:08:37 -0600
Subject: [PATCH] Add player death exp control options Subject: [PATCH] Add player death exp control options
@@ -9,10 +9,10 @@ Subject: [PATCH] Add player death exp control options
2 files changed, 16 insertions(+), 3 deletions(-) 2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 5991a41c1..b6459cd47 100644 index 7b54b02e2..69ac51935 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java --- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -1859,9 +1859,18 @@ public abstract class EntityHuman extends EntityLiving { @@ -1866,9 +1866,18 @@ public abstract class EntityHuman extends EntityLiving {
@Override @Override
protected int getExpValue(EntityHuman entityhuman) { protected int getExpValue(EntityHuman entityhuman) {
if (!this.world.getGameRules().getBoolean(GameRules.KEEP_INVENTORY) && !this.isSpectator()) { if (!this.world.getGameRules().getBoolean(GameRules.KEEP_INVENTORY) && !this.isSpectator()) {