Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 18: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:
892f479f Fix nullability annotation for Tameable#getOwnerUniqueId (Fixes #2968)
49503ef0 Don't NPE on exporting config with null values (Fixes #2973)
7434b6d7 Fix ProjectilCollideEvent cancellation (Fixes #2953)
e5e4e9f7 Do not send PlayerProfile info before initial server send
This commit is contained in:
William Blake Galbreath
2020-02-22 15:37:01 -06:00
parent 178104b912
commit 42e3b91b7b
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: 4e0ed1f812...892f479fb4

2
current-paper
View File

@@ -1 +1 @@
1.15.2--2adc7d796957838713130cf2e1210c7b92f2cfee 1.15.2--7520dc06c8ea2db9ee7d326c38e146f9b5c87533

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

@@ -1,4 +1,4 @@
From 9808c450e63a2d12f8a05365b9150bf36bdea31c Mon Sep 17 00:00:00 2001 From 873a7cdcc33da89dc4622f38832945346a9ec612 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] Implement AFK API Subject: [PATCH] Implement AFK API
@@ -253,10 +253,10 @@ index c76363c529..c53b07adf6 100644
public boolean batRidableInWater = false; public boolean batRidableInWater = false;
public boolean batRequireShiftToMount = true; public boolean batRequireShiftToMount = true;
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 c1acec87f9..8c5d7bd2b3 100644 index 60f62f19cb..fa9fc940a2 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
@@ -2089,4 +2089,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -2092,4 +2092,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return spigot; return spigot;
} }
// Spigot end // Spigot end