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:
23ee0a8a Fix issue with 0,0 chunks causing crash
bc8fafb2 Updated Upstream (CraftBukkit/Spigot)
ebbca5ce Drowned is a RangedEntity (fixes API for Drowned to support Ranged)
83b03eee Don't move existing players to world spawn
3b3e38fd Fix issue with loading chunk during ticking chunks issue
78431dca Update test server startup script
This commit is contained in:
William Blake Galbreath
2020-04-10 01:43:21 -05:00
parent 16e780dcdb
commit ef94c821f3
9 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: ab74bb4514...23ee0a8a88

2
current-paper
View File

@@ -1 +1 @@
1.15.2--e3c2ae70a63a25765cb15a17d3ade3b7fd06f5b7
1.15.2--0c4c1a42e0ce8f78669b86873cc1c3e9138e4022

12
patches/server/0007-Ridables.patch
View File

@@ -1,4 +1,4 @@
From 392cd63c778db648271e8db15aac6b3d4e060bf9 Mon Sep 17 00:00:00 2001
From daf74a3955b25b460a652eca689a80614f1f57e7 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
@@ -3386,10 +3386,10 @@ index 0357c9da93..98a657cece 100644
this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false));
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index f44825090f..c8e2b81a1f 100644
index fb38975830..b99ae9a7b8 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1291,6 +1291,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1292,6 +1292,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
public void a(float f, float f1, boolean flag, boolean flag1) {
@@ -3397,7 +3397,7 @@ index f44825090f..c8e2b81a1f 100644
if (this.isPassenger()) {
if (f >= -1.0F && f <= 1.0F) {
this.aZ = f;
@@ -1303,7 +1304,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1304,7 +1305,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
this.jumping = flag;
this.setSneaking(flag1);
}
@@ -4420,7 +4420,7 @@ index b24a5100b4..4695492068 100644
if (this.h == ControllerMove.Operation.MOVE_TO && !this.i.getNavigation().m()) {
double d0 = this.b - this.i.locX();
diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
index 4100e367a4..a0d932c403 100644
index 0f04bcc8b7..5a7494947c 100644
--- a/src/main/java/net/minecraft/server/EntityTypes.java
+++ b/src/main/java/net/minecraft/server/EntityTypes.java
@@ -259,6 +259,12 @@ public class EntityTypes<T extends Entity> {
@@ -5218,7 +5218,7 @@ index 0c7f094e54..62a0810062 100644
return new Vec3D(this.x * d0, this.y * d1, this.z * d2);
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 1131d43269..7451b7fc4b 100644
index 618f115ca9..ae36518374 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -975,6 +975,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

6
patches/server/0033-Signs-allow-color-codes.patch
View File

@@ -1,4 +1,4 @@
From c4c61bd67ed2e76f34bf244041d1518f29512af3 Mon Sep 17 00:00:00 2001
From ed2e473ff72e59a43f39ac0dcfbefcfce11e5827 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 17:40:30 -0500
Subject: [PATCH] Signs allow color codes
@@ -11,10 +11,10 @@ Subject: [PATCH] Signs allow color codes
4 files changed, 25 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index c8e2b81a1f..96b9d60bd4 100644
index b99ae9a7b8..24460ab531 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1131,6 +1131,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1132,6 +1132,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public void openSign(TileEntitySign tileentitysign) {
tileentitysign.a((EntityHuman) this);

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

@@ -1,4 +1,4 @@
From 7c7399ed6100b8e4794b6092d35632f597694ce9 Mon Sep 17 00:00:00 2001
From 5f4953b02d1597baf03c2a5df53b63bd69e595a6 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
@@ -50,10 +50,10 @@ index f372c13d8b..d69854b5c1 100644
super(EntityTypes.PLAYER, world);
this.bV = ItemStack.a;
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 96b9d60bd4..ed0f0542c0 100644
index 24460ab531..d94ca2acf0 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1622,8 +1622,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1623,8 +1623,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public void resetIdleTimer() {
this.cj = SystemUtils.getMonotonicMillis();

6
patches/server/0045-Players-should-not-cram-to-death.patch
View File

@@ -1,4 +1,4 @@
From 77e74101767575ce4990f63ab6adc423fa3517aa Mon Sep 17 00:00:00 2001
From dc9f0ba242e502afa865cf21bb60515bb5b9e32a Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 21 Jul 2019 18:01:46 -0500
Subject: [PATCH] Players should not cram to death
@@ -8,10 +8,10 @@ Subject: [PATCH] Players should not cram to death
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index ed0f0542c0..e9acf6509c 100644
index d94ca2acf0..3a4c88bd8a 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1105,7 +1105,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1106,7 +1106,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public boolean isInvulnerable(DamageSource damagesource) {

6
patches/server/0085-Add-permission-for-F3-N-debug.patch
View File

@@ -1,4 +1,4 @@
From 46c8ea33e9e07d877496f11d7efed7a0084b04b7 Mon Sep 17 00:00:00 2001
From 8c54b8a7c43cf63bc5580b53794ed11c63e3ad0e Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 28 Dec 2019 04:21:54 -0600
Subject: [PATCH] Add permission for F3+N debug
@@ -8,10 +8,10 @@ Subject: [PATCH] Add permission for F3+N debug
1 file changed, 1 insertion(+)
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 7b79ee4fe5..67228329bd 100644
index 6d6fbf2f50..0d985b83d8 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -903,6 +903,7 @@ public abstract class PlayerList {
@@ -904,6 +904,7 @@ public abstract class PlayerList {
} else {
b0 = (byte) (24 + i);
}

6
patches/server/0109-Optimize-Chunk-Ticks.patch
View File

@@ -1,4 +1,4 @@
From c48af70fbccc813d46cc8cfa972bf2e4ad26ef5a Mon Sep 17 00:00:00 2001
From 5edce62e30b52fab1714882adddf2e49bd67690b Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 2 Apr 2020 00:28:06 -0500
Subject: [PATCH] Optimize Chunk Ticks
@@ -135,10 +135,10 @@ index 3ed7fa324f..7f236585db 100644
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index c21a3ea506..47dcc3e745 100644
index 32fed8a39a..488be0c130 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -1351,28 +1351,28 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -1358,28 +1358,28 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
}
boolean isOutsideOfRange(ChunkCoordIntPair chunkcoordintpair, boolean reducedRange) {

8
patches/server/0114-Async-recalc-perms-and-command-map.patch
View File

@@ -1,4 +1,4 @@
From ca4b3786bb468c1d5f6284cd20c8eacf0c52ea30 Mon Sep 17 00:00:00 2001
From 2c4b9f9f107c1da3f2f9d86f13a3ad2bdfab4291 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Wed, 8 Apr 2020 23:01:20 -0500
Subject: [PATCH] Async recalc perms and command map
@@ -9,10 +9,10 @@ Subject: [PATCH] Async recalc perms and command map
2 files changed, 15 insertions(+)
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index d1c92667d8..a6b9aa898e 100644
index 0d985b83d8..eba32e614e 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -759,6 +759,15 @@ public abstract class PlayerList {
@@ -760,6 +760,15 @@ public abstract class PlayerList {
GameProfile gameprofile = entityplayer.getProfile();
int i = this.server.b(gameprofile);
@@ -28,7 +28,7 @@ index d1c92667d8..a6b9aa898e 100644
this.a(entityplayer, i);
}
@@ -892,6 +901,7 @@ public abstract class PlayerList {
@@ -893,6 +902,7 @@ public abstract class PlayerList {
}