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

Officially Update to 1.16.1 \o/

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
ab347c4c9 Updated Upstream (Bukkit/CraftBukkit/Spigot)
e2e09326d [Auto] Updated Upstream (Bukkit/CraftBukkit)
778d63b19 Add Gradle usage information to README (#3700)
25c14f76f Fix compile
78c855237 Updated Upstream (CraftBukkit)
8a4af269b fix EntityDismountEvent being fired on gen threads
55fb7da78 Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16
d70195264 Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16
443fb80bf Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16
d75c939e5 Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16
1431b1d6c Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16
e4f2ec002 Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16
122475aee Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16
b98da027d Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16
a8ffecc74 Fix NPE and uuid lookup for player skulls
This commit is contained in:
William Blake Galbreath
2020-06-30 00:30:31 -05:00
parent b6a9c2ea3b
commit ce403193df
12 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: 55fb7da780...ab347c4c96

2
current-paper
View File

@@ -1 +1 @@
1.16.1--fc22709d928ee33e5fbb99d20ffc2ca357a117d4 1.16.1--af7fcad12b93174f1c2d487fa2c00ffd262efd43

26
patches/server/0008-AFK-API.patch
View File

@@ -1,4 +1,4 @@
From d92c7dd2a708064c634e5a66ce12f673acddf32e Mon Sep 17 00:00:00 2001 From 331e2763353e816b3e1e8aa237d2343967486f2c 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, 8 Aug 2019 15:29:15 -0500 Date: Thu, 8 Aug 2019 15:29:15 -0500
Subject: [PATCH] AFK API Subject: [PATCH] AFK API
@@ -18,7 +18,7 @@ Subject: [PATCH] AFK API
11 files changed, 120 insertions(+), 25 deletions(-) 11 files changed, 120 insertions(+), 25 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 38887c1b7..3709f3386 100644 index fcb3d3adae..405a5d87d8 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
@@ -1384,6 +1384,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -1384,6 +1384,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -30,7 +30,7 @@ index 38887c1b7..3709f3386 100644
double d3 = this.locX() - d0; double d3 = this.locX() - d0;
double d4 = this.locY() - d1; double d4 = this.locY() - d1;
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 2cada09ce..a69a69859 100644 index 2cada09ced..a69a698594 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
@@ -84,6 +84,15 @@ public abstract class EntityHuman extends EntityLiving { @@ -84,6 +84,15 @@ public abstract class EntityHuman extends EntityLiving {
@@ -50,10 +50,10 @@ index 2cada09ce..a69a69859 100644
super(EntityTypes.PLAYER, world); super(EntityTypes.PLAYER, world);
this.bS = ItemStack.b; this.bS = ItemStack.b;
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index c047d8ff1..6fbbe515c 100644 index eeed8edfdf..508a91418e 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java --- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1755,8 +1755,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -1752,8 +1752,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public void resetIdleTimer() { public void resetIdleTimer() {
this.ch = SystemUtils.getMonotonicMillis(); this.ch = SystemUtils.getMonotonicMillis();
@@ -109,7 +109,7 @@ index c047d8ff1..6fbbe515c 100644
return this.serverStatisticManager; return this.serverStatisticManager;
} }
diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
index 267a6baae..d3ea51c27 100644 index 267a6baae8..d3ea51c27c 100644
--- a/src/main/java/net/minecraft/server/IEntityAccess.java --- a/src/main/java/net/minecraft/server/IEntityAccess.java
+++ b/src/main/java/net/minecraft/server/IEntityAccess.java +++ b/src/main/java/net/minecraft/server/IEntityAccess.java
@@ -143,28 +143,18 @@ public interface IEntityAccess { @@ -143,28 +143,18 @@ public interface IEntityAccess {
@@ -154,7 +154,7 @@ index 267a6baae..d3ea51c27 100644
@Nullable @Nullable
diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
index a52dd0c02..9b4795f3b 100644 index a52dd0c021..9b4795f3bd 100644
--- a/src/main/java/net/minecraft/server/IEntitySelector.java --- a/src/main/java/net/minecraft/server/IEntitySelector.java
+++ b/src/main/java/net/minecraft/server/IEntitySelector.java +++ b/src/main/java/net/minecraft/server/IEntitySelector.java
@@ -7,6 +7,7 @@ import javax.annotation.Nullable; @@ -7,6 +7,7 @@ import javax.annotation.Nullable;
@@ -174,7 +174,7 @@ index a52dd0c02..9b4795f3b 100644
// Paper start // Paper start
public static final Predicate<Entity> affectsSpawning = (entity) -> { public static final Predicate<Entity> affectsSpawning = (entity) -> {
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 5765e0f04..48a03c44f 100644 index cf83059fec..0d8daf4569 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java --- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -232,6 +232,12 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -232,6 +232,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -218,7 +218,7 @@ index 5765e0f04..48a03c44f 100644
if (from.getX() != Double.MAX_VALUE) { if (from.getX() != Double.MAX_VALUE) {
Location oldTo = to.clone(); Location oldTo = to.clone();
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index f24c4def3..093fa8074 100644 index 3a740f5669..1dfd8a9598 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java --- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -425,7 +425,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { @@ -425,7 +425,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -240,7 +240,7 @@ index f24c4def3..093fa8074 100644
} else if (entityplayer.isSleeping()) { } else if (entityplayer.isSleeping()) {
++j; ++j;
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index fc38163b1..cc08ad33e 100644 index fc38163b19..cc08ad33e4 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
@@ -266,7 +266,7 @@ index fc38163b1..cc08ad33e 100644
private static void timingsSettings() { private static void timingsSettings() {
timingsUrl = getString("settings.timings.url", timingsUrl); timingsUrl = getString("settings.timings.url", timingsUrl);
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 eda37fa43..5fa333037 100644 index eda37fa43f..5fa3330373 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
@@ -64,4 +64,15 @@ public class PurpurWorldConfig { @@ -64,4 +64,15 @@ public class PurpurWorldConfig {
@@ -286,7 +286,7 @@ index eda37fa43..5fa333037 100644
+ } + }
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 97a24b4df..3bd2ffc20 100644 index 97a24b4dff..3bd2ffc206 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2128,4 +2128,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -2128,4 +2128,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -312,7 +312,7 @@ index 97a24b4df..3bd2ffc20 100644
+ // Purpur end + // Purpur end
} }
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index f78e44e05..da4c49daf 100644 index f78e44e05f..da4c49daf4 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java --- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -207,6 +207,7 @@ public class ActivationRange @@ -207,6 +207,7 @@ public class ActivationRange

22
patches/server/0024-Player-invulnerabilities.patch
View File

@@ -1,4 +1,4 @@
From 475fd521ac59a8425121d35cf70eb47039c89dab Mon Sep 17 00:00:00 2001 From 0828a5d793cb60992427e2f0af477835712183fb 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, 2 May 2020 20:55:44 -0500 Date: Sat, 2 May 2020 20:55:44 -0500
Subject: [PATCH] Player invulnerabilities Subject: [PATCH] Player invulnerabilities
@@ -12,7 +12,7 @@ Subject: [PATCH] Player invulnerabilities
5 files changed, 44 insertions(+), 2 deletions(-) 5 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 6fbbe515c..c627ea053 100644 index 508a91418e..07f8f0fa7d 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java --- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -141,6 +141,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -141,6 +141,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -24,7 +24,7 @@ index 6fbbe515c..c627ea053 100644
} }
// Paper start // Paper start
public BlockPosition getPointInFront(double inFront) { public BlockPosition getPointInFront(double inFront) {
@@ -804,6 +806,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -801,6 +803,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
} }
@@ -37,7 +37,7 @@ index 6fbbe515c..c627ea053 100644
@Override @Override
public boolean damageEntity(DamageSource damagesource, float f) { public boolean damageEntity(DamageSource damagesource, float f) {
if (this.isInvulnerable(damagesource)) { if (this.isInvulnerable(damagesource)) {
@@ -811,7 +819,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -808,7 +816,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
} else { } else {
boolean flag = this.server.j() && this.canPvP() && "fall".equals(damagesource.translationIndex); boolean flag = this.server.j() && this.canPvP() && "fall".equals(damagesource.translationIndex);
@@ -46,15 +46,15 @@ index 6fbbe515c..c627ea053 100644
return false; return false;
} else { } else {
if (damagesource instanceof EntityDamageSource) { if (damagesource instanceof EntityDamageSource) {
@@ -1057,6 +1065,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -1054,6 +1062,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver.getWorld()); PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver1.getWorld());
this.world.getServer().getPluginManager().callEvent(changeEvent); this.world.getServer().getPluginManager().callEvent(changeEvent);
// CraftBukkit end // CraftBukkit end
+ this.invulnerableTicks = worldserver.purpurConfig.playerSpawnInvulnerableTicks; // Purpur + this.invulnerableTicks = worldserver.purpurConfig.playerSpawnInvulnerableTicks; // Purpur
return this; return this;
} }
} }
@@ -2152,9 +2161,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -2149,9 +2158,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override @Override
public boolean isFrozen() { // Paper - protected > public public boolean isFrozen() { // Paper - protected > public
@@ -74,7 +74,7 @@ index 6fbbe515c..c627ea053 100644
public Scoreboard getScoreboard() { public Scoreboard getScoreboard() {
return getBukkitEntity().getScoreboard().getHandle(); return getBukkitEntity().getScoreboard().getHandle();
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 48a03c44f..85016aa76 100644 index 0d8daf4569..47a7d1c034 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java --- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1563,6 +1563,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -1563,6 +1563,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -86,7 +86,7 @@ index 48a03c44f..85016aa76 100644
this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), packStatus)); this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), packStatus));
// Paper end // Paper end
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 3c5ba8f2f..5807e77da 100644 index 3c5ba8f2fd..5807e77dab 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java --- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -869,6 +869,8 @@ public abstract class PlayerList { @@ -869,6 +869,8 @@ public abstract class PlayerList {
@@ -99,7 +99,7 @@ index 3c5ba8f2f..5807e77da 100644
return entityplayer1; return entityplayer1;
} }
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 5fa333037..bd9b82dad 100644 index 5fa3330373..bd9b82dadf 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
@@ -75,4 +75,11 @@ public class PurpurWorldConfig { @@ -75,4 +75,11 @@ public class PurpurWorldConfig {
@@ -115,7 +115,7 @@ index 5fa333037..bd9b82dad 100644
+ } + }
} }
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 3bd2ffc20..9b1c4d932 100644 index 3bd2ffc206..9b1c4d9320 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2144,5 +2144,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -2144,5 +2144,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

6
patches/server/0040-Fix-outdated-server-showing-in-ping-before-server-fu.patch
View File

@@ -1,4 +1,4 @@
From d465dcaf5f07f171e1293db0e0066c7120d7fe19 Mon Sep 17 00:00:00 2001 From 25d12fdb337d2ee04701ad2142690107368c728f 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, 4 Jun 2019 15:50:08 -0500 Date: Tue, 4 Jun 2019 15:50:08 -0500
Subject: [PATCH] Fix 'outdated server' showing in ping before server fully Subject: [PATCH] Fix 'outdated server' showing in ping before server fully
@@ -9,10 +9,10 @@ Subject: [PATCH] Fix 'outdated server' showing in ping before server fully
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java
index da804a990..6b32bc233 100644 index ee18dc3fa2..4532406c4e 100644
--- a/src/main/java/net/minecraft/server/PacketStatusListener.java --- a/src/main/java/net/minecraft/server/PacketStatusListener.java
+++ b/src/main/java/net/minecraft/server/PacketStatusListener.java +++ b/src/main/java/net/minecraft/server/PacketStatusListener.java
@@ -135,6 +135,7 @@ public class PacketStatusListener implements PacketStatusInListener { @@ -133,6 +133,7 @@ public class PacketStatusListener implements PacketStatusInListener {
this.networkManager.sendPacket(new PacketStatusOutServerInfo(ping)); this.networkManager.sendPacket(new PacketStatusOutServerInfo(ping));
*/ */

12
patches/server/0049-Cows-eat-mushrooms.patch
View File

@@ -1,4 +1,4 @@
From 9f6feaf7259dfa214dc7e781eee36b81382ba624 Mon Sep 17 00:00:00 2001 From 8fc20523d0a02bb4dfdf896059856706dc924463 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:10:30 -0500 Date: Sat, 4 May 2019 01:10:30 -0500
Subject: [PATCH] Cows eat mushrooms Subject: [PATCH] Cows eat mushrooms
@@ -11,10 +11,10 @@ Subject: [PATCH] Cows eat mushrooms
4 files changed, 77 insertions(+), 1 deletion(-) 4 files changed, 77 insertions(+), 1 deletion(-)
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 ee36c537d..028f94a88 100644 index 846ebe876d..78b4d82620 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
@@ -2555,6 +2555,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -2561,6 +2561,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.invulnerable = flag; this.invulnerable = flag;
} }
@@ -23,7 +23,7 @@ index ee36c537d..028f94a88 100644
this.setPositionRotation(entity.locX(), entity.locY(), entity.locZ(), entity.yaw, entity.pitch); this.setPositionRotation(entity.locX(), entity.locY(), entity.locZ(), entity.yaw, entity.pitch);
} }
diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
index 30ee6df6b..d6baddb9d 100644 index 30ee6df6b4..d6baddb9d3 100644
--- a/src/main/java/net/minecraft/server/EntityCow.java --- a/src/main/java/net/minecraft/server/EntityCow.java
+++ b/src/main/java/net/minecraft/server/EntityCow.java +++ b/src/main/java/net/minecraft/server/EntityCow.java
@@ -16,6 +16,7 @@ public class EntityCow extends EntityAnimal { @@ -16,6 +16,7 @@ public class EntityCow extends EntityAnimal {
@@ -116,7 +116,7 @@ index 30ee6df6b..d6baddb9d 100644
public EntityCow createChild(EntityAgeable entityageable) { public EntityCow createChild(EntityAgeable entityageable) {
return (EntityCow) EntityTypes.COW.a(this.world); return (EntityCow) EntityTypes.COW.a(this.world);
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 03477c6e9..63cff85af 100644 index 03477c6e91..63cff85af9 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java --- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -80,7 +80,7 @@ public abstract class EntityLiving extends Entity { @@ -80,7 +80,7 @@ public abstract class EntityLiving extends Entity {
@@ -129,7 +129,7 @@ index 03477c6e9..63cff85af 100644
public float aJ; public float aJ;
public float aK; public float aK;
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 ec490745b..faddf7c4b 100644 index ec490745b0..faddf7c4bc 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
@@ -115,6 +115,11 @@ public class PurpurWorldConfig { @@ -115,6 +115,11 @@ public class PurpurWorldConfig {

14
patches/server/0056-Signs-allow-color-codes.patch
View File

@@ -1,4 +1,4 @@
From 1239cbcedd86d3ba666166ac3bc63063ea77188d Mon Sep 17 00:00:00 2001 From 448a2ac9aa4422c108643494f19c1cdbe900ed3b 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, 6 Jun 2019 17:40:30 -0500 Date: Thu, 6 Jun 2019 17:40:30 -0500
Subject: [PATCH] Signs allow color codes Subject: [PATCH] Signs allow color codes
@@ -12,10 +12,10 @@ Subject: [PATCH] Signs allow color codes
5 files changed, 36 insertions(+) 5 files changed, 36 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index be90231e6..17476e908 100644 index 07f8f0fa7d..3556e86fd7 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java --- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1272,6 +1272,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -1269,6 +1269,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public void openSign(TileEntitySign tileentitysign) { public void openSign(TileEntitySign tileentitysign) {
tileentitysign.a((EntityHuman) this); tileentitysign.a((EntityHuman) this);
this.playerConnection.sendPacket(new PacketPlayOutOpenSignEditor(tileentitysign.getPosition())); this.playerConnection.sendPacket(new PacketPlayOutOpenSignEditor(tileentitysign.getPosition()));
@@ -24,7 +24,7 @@ index be90231e6..17476e908 100644
public int nextContainerCounter() { // CraftBukkit - void -> int public int nextContainerCounter() { // CraftBukkit - void -> int
diff --git a/src/main/java/net/minecraft/server/IChatBaseComponent.java b/src/main/java/net/minecraft/server/IChatBaseComponent.java diff --git a/src/main/java/net/minecraft/server/IChatBaseComponent.java b/src/main/java/net/minecraft/server/IChatBaseComponent.java
index fd3e6cda6..750896fc8 100644 index fd3e6cda6a..750896fc82 100644
--- a/src/main/java/net/minecraft/server/IChatBaseComponent.java --- a/src/main/java/net/minecraft/server/IChatBaseComponent.java
+++ b/src/main/java/net/minecraft/server/IChatBaseComponent.java +++ b/src/main/java/net/minecraft/server/IChatBaseComponent.java
@@ -344,6 +344,7 @@ public interface IChatBaseComponent extends Message, IChatFormatted, Iterable<IC @@ -344,6 +344,7 @@ public interface IChatBaseComponent extends Message, IChatFormatted, Iterable<IC
@@ -36,7 +36,7 @@ index fd3e6cda6..750896fc8 100644
return IChatBaseComponent.ChatSerializer.a.toJson(ichatbasecomponent); return IChatBaseComponent.ChatSerializer.a.toJson(ichatbasecomponent);
} }
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index d2d96eacc..4c5618892 100644 index e2c7ab7f04..be5b5b0573 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java --- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2701,6 +2701,14 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -2701,6 +2701,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -55,7 +55,7 @@ index d2d96eacc..4c5618892 100644
} }
SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines); SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines);
diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
index e1ab29975..1778c5474 100644 index e1ab299756..1778c5474f 100644
--- a/src/main/java/net/minecraft/server/TileEntitySign.java --- a/src/main/java/net/minecraft/server/TileEntitySign.java
+++ b/src/main/java/net/minecraft/server/TileEntitySign.java +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
@@ -1,6 +1,14 @@ @@ -1,6 +1,14 @@
@@ -96,7 +96,7 @@ index e1ab29975..1778c5474 100644
@Override @Override
public PacketPlayOutTileEntityData getUpdatePacket() { public PacketPlayOutTileEntityData getUpdatePacket() {
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 ed6102b40..5df442c5b 100644 index ed6102b407..5df442c5b8 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
@@ -92,9 +92,12 @@ public class PurpurWorldConfig { @@ -92,9 +92,12 @@ public class PurpurWorldConfig {

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

@@ -1,4 +1,4 @@
From 54e723d0928f87ed9cd5be90508fb9b6f07bb40e Mon Sep 17 00:00:00 2001 From e5a6ecb6355378875b4a83f3976dbade4ffcb490 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 21 Jul 2019 18:01:46 -0500 Date: Sun, 21 Jul 2019 18:01:46 -0500
Subject: [PATCH] Players should not cram to death 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(-) 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 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 17476e908..b54960d25 100644 index 3556e86fd7..42f3ef1ee6 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java --- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1246,7 +1246,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -1243,7 +1243,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override @Override
public boolean isInvulnerable(DamageSource damagesource) { public boolean isInvulnerable(DamageSource damagesource) {

6
patches/server/0064-Do-not-strip-colors-from-death-messages.patch
View File

@@ -1,4 +1,4 @@
From cb512084b525bac9346f5a0c4786ed30ecc163d5 Mon Sep 17 00:00:00 2001 From a39be3fb1c8b97c9dc58761e79799ca1cd78c907 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com> From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sun, 7 Jun 2020 13:16:02 -0500 Date: Sun, 7 Jun 2020 13:16:02 -0500
Subject: [PATCH] Do not strip colors from death messages Subject: [PATCH] Do not strip colors from death messages
@@ -8,10 +8,10 @@ Subject: [PATCH] Do not strip colors from death messages
1 file changed, 1 insertion(+), 1 deletion(-) 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 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index b54960d25..9801d87f0 100644 index 42f3ef1ee6..b224ff153d 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java --- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -665,7 +665,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -662,7 +662,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
IChatBaseComponent defaultMessage = this.getCombatTracker().getDeathMessage(); IChatBaseComponent defaultMessage = this.getCombatTracker().getDeathMessage();

26
patches/server/0089-Climbing-should-not-bypass-cramming-gamerule.patch
View File

@@ -1,4 +1,4 @@
From 8fd73dd12bc7497f5018bc32cf0c0c3c7d3ec03a Mon Sep 17 00:00:00 2001 From eb936e62ffd83c845bc3d376837703b27aa556bc Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 21 Jul 2019 18:06:20 -0500 Date: Sun, 21 Jul 2019 18:06:20 -0500
Subject: [PATCH] Climbing should not bypass cramming gamerule Subject: [PATCH] Climbing should not bypass cramming gamerule
@@ -18,7 +18,7 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule
11 files changed, 27 insertions(+), 13 deletions(-) 11 files changed, 27 insertions(+), 13 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 3061b91ed..6bc5ebc43 100644 index 656413254e..2efb8a9759 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
@@ -1525,6 +1525,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -1525,6 +1525,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -35,7 +35,7 @@ index 3061b91ed..6bc5ebc43 100644
} }
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index 7543f2cee..c3cde1568 100644 index 7543f2ceeb..c3cde15686 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -318,7 +318,7 @@ public class EntityArmorStand extends EntityLiving { @@ -318,7 +318,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -48,7 +48,7 @@ index 7543f2cee..c3cde1568 100644
} }
diff --git a/src/main/java/net/minecraft/server/EntityBat.java b/src/main/java/net/minecraft/server/EntityBat.java diff --git a/src/main/java/net/minecraft/server/EntityBat.java b/src/main/java/net/minecraft/server/EntityBat.java
index 3dd3b8913..99bae2dcb 100644 index 3dd3b8913e..99bae2dcb7 100644
--- a/src/main/java/net/minecraft/server/EntityBat.java --- a/src/main/java/net/minecraft/server/EntityBat.java
+++ b/src/main/java/net/minecraft/server/EntityBat.java +++ b/src/main/java/net/minecraft/server/EntityBat.java
@@ -50,7 +50,7 @@ public class EntityBat extends EntityAmbient { @@ -50,7 +50,7 @@ public class EntityBat extends EntityAmbient {
@@ -61,7 +61,7 @@ index 3dd3b8913..99bae2dcb 100644
} }
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 a20d6feb8..92c1d1794 100644 index a20d6feb8c..92c1d1794a 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
@@ -104,7 +104,7 @@ public class EntityBoat extends Entity { @@ -104,7 +104,7 @@ public class EntityBoat extends Entity {
@@ -74,7 +74,7 @@ index a20d6feb8..92c1d1794 100644
} }
diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
index ee7a2fedd..c9ab80ccd 100644 index ee7a2fedde..c9ab80ccd1 100644
--- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
@@ -165,7 +165,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven @@ -165,7 +165,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -87,7 +87,7 @@ index ee7a2fedd..c9ab80ccd 100644
} }
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index f86499c87..bc9e2e0c7 100644 index f86499c87e..bc9e2e0c75 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java --- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2852,7 +2852,7 @@ public abstract class EntityLiving extends Entity { @@ -2852,7 +2852,7 @@ public abstract class EntityLiving extends Entity {
@@ -111,7 +111,7 @@ index f86499c87..bc9e2e0c7 100644
// CraftBukkit start - collidable API // CraftBukkit start - collidable API
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 cdbe1a32e..c33b5c950 100644 index cdbe1a32e0..c33b5c950d 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
@@ -108,7 +108,7 @@ public abstract class EntityMinecartAbstract extends Entity { @@ -108,7 +108,7 @@ public abstract class EntityMinecartAbstract extends Entity {
@@ -124,7 +124,7 @@ index cdbe1a32e..c33b5c950 100644
} }
diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java
index 2172fcefb..7afdb3060 100644 index 2172fcefbc..7afdb30603 100644
--- a/src/main/java/net/minecraft/server/EntityParrot.java --- a/src/main/java/net/minecraft/server/EntityParrot.java
+++ b/src/main/java/net/minecraft/server/EntityParrot.java +++ b/src/main/java/net/minecraft/server/EntityParrot.java
@@ -314,8 +314,8 @@ public class EntityParrot extends EntityPerchable implements EntityBird { @@ -314,8 +314,8 @@ public class EntityParrot extends EntityPerchable implements EntityBird {
@@ -139,10 +139,10 @@ index 2172fcefb..7afdb3060 100644
@Override @Override
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 408475299..87a668a85 100644 index b224ff153d..d1d5601dbe 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java --- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1808,8 +1808,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -1805,8 +1805,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
} }
@Override @Override
@@ -154,7 +154,7 @@ index 408475299..87a668a85 100644
// Purpur end // Purpur end
diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
index 9b4795f3b..192d9798c 100644 index 9b4795f3bd..192d9798c4 100644
--- a/src/main/java/net/minecraft/server/IEntitySelector.java --- a/src/main/java/net/minecraft/server/IEntitySelector.java
+++ b/src/main/java/net/minecraft/server/IEntitySelector.java +++ b/src/main/java/net/minecraft/server/IEntitySelector.java
@@ -45,11 +45,17 @@ public final class IEntitySelector { @@ -45,11 +45,17 @@ public final class IEntitySelector {
@@ -177,7 +177,7 @@ index 9b4795f3b..192d9798c 100644
} else if (entity.world.isClientSide && (!(entity1 instanceof EntityHuman) || !((EntityHuman) entity1).ey())) { } else if (entity.world.isClientSide && (!(entity1 instanceof EntityHuman) || !((EntityHuman) entity1).ey())) {
return false; return false;
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 f21b01565..39163634c 100644 index f21b015657..39163634c5 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
@@ -119,6 +119,7 @@ public class PurpurWorldConfig { @@ -119,6 +119,7 @@ public class PurpurWorldConfig {

2
scripts/apply.sh
View File

@@ -57,7 +57,7 @@ function applyPatch {
echo "Resetting $target to $what_name..." echo "Resetting $target to $what_name..."
git remote rm upstream > /dev/null 2>&1 git remote rm upstream > /dev/null 2>&1
git remote add upstream "$basedir"/"$what" >/dev/null 2>&1 git remote add upstream "$basedir"/"$what" >/dev/null 2>&1
git checkout master 2>/dev/null || git checkout -b master git checkout ver/1.16 2>/dev/null || git checkout -b ver/1.16
git fetch upstream >/dev/null 2>&1 git fetch upstream >/dev/null 2>&1
git reset --hard upstream/upstream git reset --hard upstream/upstream
echo " Applying patches to $target..." echo " Applying patches to $target..."

2
scripts/upstream.sh
View File

@@ -11,7 +11,7 @@ done
if [[ "$1" == up* ]]; then if [[ "$1" == up* ]]; then
( (
cd "$basedir/Paper/" || exit cd "$basedir/Paper/" || exit
git fetch && git reset --hard origin/master git fetch && git reset --hard origin/ver/1.16
cd ../ cd ../
git add Paper git add Paper
) )