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 appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@8681503 Call EntityChangeBlockEvent for frogs egg (#8136)
PaperMC/Paper@ec0c550 Call BlockPhysicsEvent more often (#8264)
PaperMC/Paper@f528f53 Correct javadocs on PlayerArmorStandManipulateEvent (#7719)
PaperMC/Paper@3996e6e Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
BillyGalbreath
2022-09-23 23:11:56 -05:00
parent aa392265a7
commit 103965b5b4
19 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/api/0005-Purpur-client-support.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur client support
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 5e51bc9176b481ec70fd7e5ac23d04d59f8d1a9a..1323417dd5016f59151f55feda02756eb9606368 100644
index 1d98abff1ad0116f7a2599f078aa730cb84843c1..a74aee455dffa6eb3a90ac12b9933eb3f0d5a4fc 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2808,4 +2808,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2832,4 +2832,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Override
Spigot spigot();
// Spigot end

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

@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 1323417dd5016f59151f55feda02756eb9606368..28bc08ba58ddc1a8e58e76d1546650fc14544643 100644
index a74aee455dffa6eb3a90ac12b9933eb3f0d5a4fc..64f42f8eb62a475c7407be2f461fc0d10ea014e9 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2816,5 +2816,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2840,5 +2840,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @return True if Player uses Purpur Client
*/
public boolean usesPurpurClient();

4
patches/api/0017-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
index 28bc08ba58ddc1a8e58e76d1546650fc14544643..251a6d1fc77a10d6895dbf14763d20e51260f8a9 100644
index 64f42f8eb62a475c7407be2f461fc0d10ea014e9..f569064325dceed352b3ab993add415526b93950 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2835,5 +2835,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2859,5 +2859,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Reset the idle timer back to 0
*/
void resetIdleTimer();

4
patches/api/0019-ItemStack-convenience-methods.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] ItemStack convenience methods
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
index 1d6baee05643607baa40a07022576906ea61a92f..5da8af8e11dfa741aea4c167c4cb5e63dbdf5e70 100644
index cb00e050cd5fff3a037a32ac34e02eeea3827357..6c82d84c190dee87cc72ed0d06f089348c6fddf4 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
@@ -10221,4 +10221,39 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
@@ -10235,4 +10235,39 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
return Bukkit.getUnsafe().getCreativeCategory(this);
}

4
patches/api/0035-Flying-Fall-Damage-API.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Flying Fall Damage API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 251a6d1fc77a10d6895dbf14763d20e51260f8a9..d78b901599c387ed86f9a0820eddfc3d3bd13830 100644
index f569064325dceed352b3ab993add415526b93950..878d10ab18d325e82b42f83fce19360d187322ae 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2856,5 +2856,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2880,5 +2880,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param invulnerableTicks Invulnerable ticks remaining
*/
void setSpawnInvulnerableTicks(int invulnerableTicks);

6
patches/api/0050-Debug-Marker-API.patch
View File

@@ -179,7 +179,7 @@ index 032ed217706fd27beb4d8247b77e5b7c0381bd04..fea1283dcbac2794402bcd97f072ad3f
// Purpur end
}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 3d053490dc87724f57893a553f1ab9cf1a3b73c0..ec8c098ee07ac88c023ec6274788c94a4cffc835 100644
index 8effbbd33c0af0ac421e5aef1586e8579ef097e4..0cd49cb31b21e52009f6220d505aa2a3713381b3 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -3993,6 +3993,76 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -260,10 +260,10 @@ index 3d053490dc87724f57893a553f1ab9cf1a3b73c0..ec8c098ee07ac88c023ec6274788c94a
/**
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index d78b901599c387ed86f9a0820eddfc3d3bd13830..1ff55fb1e32fe713cbfd7a39c2e80fc57d024284 100644
index 878d10ab18d325e82b42f83fce19360d187322ae..3e9b58f1f63e472fa292d25002c5aff8c474fca1 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2870,5 +2870,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2894,5 +2894,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @return True if fall damage is enabled when {@link #getAllowFlight()} is true
*/
public boolean hasFlyingFallDamage();

4
patches/api/0051-add-Player-showCreditScreen.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] add Player#showCreditScreen
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 1ff55fb1e32fe713cbfd7a39c2e80fc57d024284..f50c61a8c375af03f3f0f5469e376e3f9c19f03e 100644
index 3e9b58f1f63e472fa292d25002c5aff8c474fca1..d0d617284248065e728e4940d240be5bff1103e4 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2387,6 +2387,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2411,6 +2411,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public void showDemoScreen();

4
patches/api/0052-Add-death-screen-API.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add death screen API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index f50c61a8c375af03f3f0f5469e376e3f9c19f03e..872a1c0f4ac33ee6739b3d73ee99670da05e33c6 100644
index d0d617284248065e728e4940d240be5bff1103e4..80f0d631a9780ec853b2ab44d5bcbec45f7d4051 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2948,5 +2948,21 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2972,5 +2972,21 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Clears all debug block highlights
*/
void clearBlockHighlights();