Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 01:47:42 +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:
d0ad658b Fix slime block in Anti-Xray
c64ad85b Fixed TileEntityBell memory leak
a84348b6 Add player elytra boost API
6dad6258 Fix item locations dropped from campfires
This commit is contained in:
William Blake Galbreath
2020-10-20 15:31:13 -05:00
parent 4beb3d1768
commit 14420cf3c2
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: cfc098be5c...d0ad658b0c

2
current-paper
View File

@@ -1 +1 @@
1.16.3--780f0992380edf85b75734fa90ec209bb0653057 1.16.3--6ba4ed5238bb4963a86e613d22f6e8e367f44436

4
patches/api/0008-AFK-API.patch
View File

@@ -81,10 +81,10 @@ index 00000000..0c8b3e5e
+ } + }
+} +}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 991f757a..472194e7 100644 index 16bdb4b7..cf70931b 100644
--- a/src/main/java/org/bukkit/entity/Player.java --- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1887,4 +1887,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -1900,4 +1900,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Override @Override
Spigot spigot(); Spigot spigot();
// Spigot end // Spigot end

4
patches/api/0020-Player-invulnerabilities.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 472194e7..ca98852f 100644 index cf70931b..96db1fad 100644
--- a/src/main/java/org/bukkit/entity/Player.java --- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1907,5 +1907,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -1920,5 +1920,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Reset the idle timer back to 0 * Reset the idle timer back to 0
*/ */
void resetIdleTimer(); void resetIdleTimer();

4
patches/server/0009-AFK-API.patch
View File

@@ -268,10 +268,10 @@ index 361f7857e..2578a4677 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 fb1852ea6..d32c9c9cd 100644 index 9f04172fb..6db07713e 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
@@ -2178,4 +2178,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -2192,4 +2192,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return spigot; return spigot;
} }
// Spigot end // Spigot end

4
patches/server/0021-Player-invulnerabilities.patch
View File

@@ -108,10 +108,10 @@ index 2578a4677..c441fcea9 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 d32c9c9cd..d074392be 100644 index 6db07713e..7d04913f9 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
@@ -2194,5 +2194,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -2208,5 +2208,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() { public void resetIdleTimer() {
getHandle().resetIdleTimer(); getHandle().resetIdleTimer();
} }