Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37: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@b9b4c9a Deprecate duplicate API for arrow stuck count (#8829)
PaperMC/Paper@57f1157 Updated Upstream (Bukkit/CraftBukkit) (#8823)
This commit is contained in:
granny
2023-02-08 20:24:09 -08:00
parent 5c6a830298
commit cbb7fc002e
23 changed files with 60 additions and 60 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 c68df5e5cc63b26da8623cf27e257ef07a61897d..ee238e894b10bf089fa3be496a81bcb647aa8100 100644
index b0bd8194d263f6986e80b7d9848297a2bf27a112..ce1dfcef1a82e63b8dd53a8f278b601958c2e8e8 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2946,4 +2946,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2971,4 +2971,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 ee238e894b10bf089fa3be496a81bcb647aa8100..0416b3de7a2e439891aa7b8c2c7536d7f4096026 100644
index ce1dfcef1a82e63b8dd53a8f278b601958c2e8e8..f4d31bd1301e7e38f46be6b93c6021169c8eca75 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2954,5 +2954,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2979,5 +2979,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @return True if Player uses Purpur Client
*/
public boolean usesPurpurClient();

4
patches/api/0013-LivingEntity-safeFallDistance.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] LivingEntity safeFallDistance
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index ead90b002034c463983af948a4fb882109b8d3a2..cb45f3ae2b13ec13e02a931dd870e86c5eabf6c9 100644
index 6555397148b84dba7a87cae505544b65452f1742..3aee8f29fece72485eb9ada371d6444633120a53 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -1107,4 +1107,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -1126,4 +1126,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
*/
void damageItemStack(org.bukkit.inventory.@NotNull EquipmentSlot slot, int amount);
// Paper end

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 0416b3de7a2e439891aa7b8c2c7536d7f4096026..2ab176269dea6035fd778640430f4f0fd499dd3b 100644
index f4d31bd1301e7e38f46be6b93c6021169c8eca75..b269df50f3913d40646cfc597d78851ed0c0acb4 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2973,5 +2973,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2998,5 +2998,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Reset the idle timer back to 0
*/
void resetIdleTimer();

4
patches/api/0022-LivingEntity-broadcastItemBreak.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] LivingEntity#broadcastItemBreak
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index cb45f3ae2b13ec13e02a931dd870e86c5eabf6c9..a4fbc1f6f71759ed9e11b4487aff04961946b7d8 100644
index 3aee8f29fece72485eb9ada371d6444633120a53..7f828209e0323475ec51e44975e3b3ac10aa265b 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -1122,5 +1122,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -1141,5 +1141,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
* @param safeFallDistance Safe fall distance
*/
void setSafeFallDistance(float safeFallDistance);

4
patches/api/0034-API-for-any-mob-to-burn-daylight.patch
View File

@@ -23,10 +23,10 @@ index 56afcc92854897ad5c971e576f96414bae766b7a..d8f30fca0b5b9673c5dd8a78e87a378c
// Purpur end
}
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index a4fbc1f6f71759ed9e11b4487aff04961946b7d8..d1379d8eee19bcef3b9ffa7c86961f9ce57f76ad 100644
index 7f828209e0323475ec51e44975e3b3ac10aa265b..ebc42a0ed4b24564a5055fef50468142529aed2f 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -1129,5 +1129,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -1148,5 +1148,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
* @param slot Equipment slot to play break animation for
*/
void broadcastItemBreak(@NotNull org.bukkit.inventory.EquipmentSlot slot);

4
patches/api/0046-Add-local-difficulty-api.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add local difficulty api
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 9e71e519cda72a1e2a01474f238b97015ec5115e..8effbbd33c0af0ac421e5aef1586e8579ef097e4 100644
index aa04d7df70d99402c91e920fd693d7d4fb655786..bb249f7d54fd90d63f609eedf0bbb463f1aa96f1 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -3985,6 +3985,16 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -4010,6 +4010,16 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@Nullable
public DragonBattle getEnderDragonBattle();

8
patches/api/0049-Debug-Marker-API.patch
View File

@@ -179,10 +179,10 @@ index 2b64836fcfd22c7b11030aca4de44784440e285b..e0f69edf603c2ec99bc92b16b1891227
// Purpur end
}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 8effbbd33c0af0ac421e5aef1586e8579ef097e4..0cd49cb31b21e52009f6220d505aa2a3713381b3 100644
index bb249f7d54fd90d63f609eedf0bbb463f1aa96f1..a38863ebd363f54994753937a10e041076846af0 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
@@ -4018,6 +4018,76 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
* @return The local difficulty
*/
public float getLocalDifficultyAt(@NotNull Location location);
@@ -260,10 +260,10 @@ index 8effbbd33c0af0ac421e5aef1586e8579ef097e4..0cd49cb31b21e52009f6220d505aa2a3
/**
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 2ab176269dea6035fd778640430f4f0fd499dd3b..b4b4d49de4edd13d9e0f24b8042ce6103e5b0466 100644
index b269df50f3913d40646cfc597d78851ed0c0acb4..b51589a741ee529113c42529df1d3551afd606ef 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2994,5 +2994,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3019,5 +3019,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param invulnerableTicks Invulnerable ticks remaining
*/
void setSpawnInvulnerableTicks(int invulnerableTicks);

4
patches/api/0050-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 b4b4d49de4edd13d9e0f24b8042ce6103e5b0466..b50a378f6de813a51ea57fced46d1df8eca6609a 100644
index b51589a741ee529113c42529df1d3551afd606ef..46dd9980b4ef09153c1ad9cbf447e7089ecfa6ac 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3064,5 +3064,21 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3089,5 +3089,21 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Clears all debug block highlights
*/
void clearBlockHighlights();