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

rebase

Browse Source
This commit is contained in:
Ben Kerllenevich
2021-11-26 19:28:34 -05:00
parent 19b899b280
commit 9afd573ce5
24 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/api/0003-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 7de08c12aec311a8de631a8ec37147579c5e9963..90a1635379f3db8f6158099198d142e6c2cc1c8c 100644
index 5d928c5e82033dd812d406fce7353fd4824195c0..8189fe28d692608b78c7861f0202d2ba17587de9 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2290,4 +2290,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2298,4 +2298,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Override
Spigot spigot();
// Spigot end

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

@@ -81,10 +81,10 @@ index 0000000000000000000000000000000000000000..0c8b3e5e4ba412624357ea5662a78862
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 90a1635379f3db8f6158099198d142e6c2cc1c8c..dfc092c5f1f4e00d3eabb72b9f15d203cca602f7 100644
index 8189fe28d692608b78c7861f0202d2ba17587de9..252d848393525da36378148d9698cc05a39d8d11 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2298,5 +2298,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2306,5 +2306,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @return True if Player uses Purpur Client
*/
public boolean usesPurpurClient();

4
patches/api/0015-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 dfc092c5f1f4e00d3eabb72b9f15d203cca602f7..081713363eaee99b9332f05e8d7afc218a044754 100644
index 252d848393525da36378148d9698cc05a39d8d11..18eb516f3fbe29df9b4e81d3969d6c3fee799dd7 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2317,5 +2317,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2325,5 +2325,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Reset the idle timer back to 0
*/
void resetIdleTimer();

6
patches/api/0027-Fix-javadoc-warnings-missing-param-and-return.patch
View File

@@ -921,10 +921,10 @@ index a6a7429ed2e1eefb2b12b7480ed74fcc3963a864..e8027e1d505dda6effbb1698550016e8
NORMAL(false),
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 081713363eaee99b9332f05e8d7afc218a044754..fb4d5be0a972a5a8d441a628d796d6ada86cfe79 100644
index 18eb516f3fbe29df9b4e81d3969d6c3fee799dd7..ef9a545f71a2a5ee37b188355d789705f928280e 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2120,6 +2120,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2128,6 +2128,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
void resetCooldown();
/**
@@ -933,7 +933,7 @@ index 081713363eaee99b9332f05e8d7afc218a044754..fb4d5be0a972a5a8d441a628d796d6ad
* @return the client option value of the player
*/
@NotNull
@@ -2151,6 +2153,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2159,6 +2161,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
// Paper end
// Spigot start

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 2b2c36e950f1518c795208157f52211a2e93f467..d4f66b338ecfe8c1bdcd8f5763e61539923c7efc 100644
index 15243abfcbebb0219cabbf56a18910da2f1a027a..ada1063772875d02321cefead55a054efc4369c0 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2343,5 +2343,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2351,5 +2351,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param invulnerableTicks Invulnerable ticks remaining
*/
void setSpawnInvulnerableTicks(int invulnerableTicks);