Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 17:07: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:
01b965e0 Fix getChunkAtIfCachedImmediately (#2915)
0a897d6e Rebuild patches
5792c862 Updated Upstream (Bukkit/CraftBukkit/Spigot)
c9eebbb8 Fix Player#applyMending NPE (#2917)
d16a5d88 Performance patches prerequisite (#2802)
This commit is contained in:
William Blake Galbreath
2020-01-29 21:58:09 -06:00
parent 8439e5b604
commit ddf1f8a586
17 changed files with 96 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
patches/server/0050-Implement-AFK-API.patch
View File

@@ -1,4 +1,4 @@
From 8f9291b0064b5f283fca8915db808cf4b6767ab5 Mon Sep 17 00:00:00 2001
From 4337b1d75f67fd41da02eda525fac381840a33de 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,7 +17,7 @@ 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 416eb5d77..c24f7071a 100644
index 3be37a1008..9904b78c6c 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1375,6 +1375,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -29,7 +29,7 @@ index 416eb5d77..c24f7071a 100644
double d3 = this.locX() - d0;
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
index d5e8831f1..1302c36b2 100644
index de22cad764..9d26bd1e4c 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -86,6 +86,15 @@ public abstract class EntityHuman extends EntityLiving {
@@ -49,10 +49,10 @@ index d5e8831f1..1302c36b2 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 5545df892..621e3948e 100644
index d72b45119d..6022079a9d 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1611,8 +1611,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1615,8 +1615,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public void resetIdleTimer() {
this.cj = SystemUtils.getMonotonicMillis();
@@ -105,7 +105,7 @@ index 5545df892..621e3948e 100644
return this.serverStatisticManager;
}
diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
index 774ec96f0..5ef881634 100644
index 774ec96f0a..5ef8816340 100644
--- a/src/main/java/net/minecraft/server/IEntityAccess.java
+++ b/src/main/java/net/minecraft/server/IEntityAccess.java
@@ -116,28 +116,18 @@ public interface IEntityAccess {
@@ -150,7 +150,7 @@ index 774ec96f0..5ef881634 100644
@Nullable
diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
index 8d7273a38..71c61dc45 100644
index 8d7273a38b..71c61dc45e 100644
--- a/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;
@@ -170,7 +170,7 @@ index 8d7273a38..71c61dc45 100644
public static Predicate<Entity> a(double d0, double d1, double d2, double d3) {
double d4 = d3 * d3;
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index a4af019bc..2db59c55c 100644
index a4af019bc6..2db59c55ca 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -277,6 +277,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -205,7 +205,7 @@ index a4af019bc..2db59c55c 100644
if (from.getX() != Double.MAX_VALUE) {
Location oldTo = to.clone();
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index a0477134d..9d3df98e7 100644
index 2d0db3e05f..04685efc52 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -376,7 +376,7 @@ public class WorldServer extends World {
@@ -227,7 +227,7 @@ index a0477134d..9d3df98e7 100644
} else if (entityplayer.isSleeping()) {
++j;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 6d875b78b..7422f361e 100644
index 6d875b78b9..7422f361e4 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -106,6 +106,21 @@ public class PurpurWorldConfig {
@@ -253,7 +253,7 @@ index 6d875b78b..7422f361e 100644
private void itemsCanBreakTurtleEggs() {
itemsCanBreakTurtleEggs = getBoolean("items-can-break-turtle-eggs", itemsCanBreakTurtleEggs);
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index c1acec87f..8c5d7bd2b 100644
index c1acec87f9..8c5d7bd2b3 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2089,4 +2089,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -279,7 +279,7 @@ index c1acec87f..8c5d7bd2b 100644
+ // Purpur end
}
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index 6e165a164..da5fef091 100644
index 6e165a1649..da5fef091a 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -137,6 +137,7 @@ public class ActivationRange