mirror/Purpur
2
0
Fork 0
mirror of https://github.com/PurpurMC/Purpur.git synced 2025-02-17 13:00:04 +08: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@afa16e6 Modify offline mode warning to include Velocity line (#8812)
PaperMC/Paper@de38a45 Add projectile hit simulation API (#8816)
PaperMC/Paper@7e7e6b4 More Win Screen API (#8805)
PaperMC/Paper@bd77b78 Fix desync of honeycomb when the event is canceled (#8713)
PaperMC/Paper@bb05fcf Add missing isFuel Material entries (#8843)
PaperMC/Paper@8d1acf6 Call PlayerReadyArrowEvent for when items in the offhand are used (#8842)
PaperMC/Paper@f2f9e8c Remove patch that was made obsolete by vanilla (#8847)
This commit is contained in:
granny 2023-02-13 15:48:05 -08:00
parent 0090323edb
commit 08aa4dccaa
No known key found for this signature in database
19 changed files with 54 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -1,7 +1,7 @@
group = org.purpurmc.purpur
version = 1.19.3-R0.1-SNAPSHOT
paperCommit = 5eca9642e1680e3e1074653d1c9e43799d172332
paperCommit = f2f9e8cc4dde8b2e754d193d553b99fa824515b1
org.gradle.caching = true
org.gradle.parallel = true

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 b0bd8194d263f6986e80b7d9848297a2bf27a112..ce1dfcef1a82e63b8dd53a8f278b601958c2e8e8 100644
index d7d94b954262da0cbe11850cbc3ebd45e32c8c76..f4586e7326f4a146778cdc61fb087b8d5c141ab0 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2971,4 +2971,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3000,4 +3000,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 ce1dfcef1a82e63b8dd53a8f278b601958c2e8e8..f4d31bd1301e7e38f46be6b93c6021169c8eca75 100644
index f4586e7326f4a146778cdc61fb087b8d5c141ab0..0226881e26431dded883557f003c2d3a5ced349b 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2979,5 +2979,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3008,5 +3008,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 f4d31bd1301e7e38f46be6b93c6021169c8eca75..b269df50f3913d40646cfc597d78851ed0c0acb4 100644
index 0226881e26431dded883557f003c2d3a5ced349b..9bbb58d173ab3e0c586273e9135c40184cb5e127 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2998,5 +2998,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3027,5 +3027,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 e5b94299793ba7cb9071a3f3a35ddbe08b0b9906..0a3013843f7e1d3fcedfaca6a7b288642ebcb407 100644
index ee471fbd7c2138cd330b2c64da4e77b3414ec913..4df3de56641b0ce028f25ee8d3ed496c707302a7 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
@@ -10688,4 +10688,39 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
@@ -10714,4 +10714,39 @@ public enum Material implements Keyed, net.kyori.adventure.translation.Translata
return Bukkit.getUnsafe().getCreativeCategory(this);
}

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

@ -260,10 +260,10 @@ index bb249f7d54fd90d63f609eedf0bbb463f1aa96f1..a38863ebd363f54994753937a10e0410
/**
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index b269df50f3913d40646cfc597d78851ed0c0acb4..b51589a741ee529113c42529df1d3551afd606ef 100644
index 9bbb58d173ab3e0c586273e9135c40184cb5e127..9464ec6b436b79f015f50279aed2ed38e32d5909 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3019,5 +3019,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3048,5 +3048,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 b51589a741ee529113c42529df1d3551afd606ef..46dd9980b4ef09153c1ad9cbf447e7089ecfa6ac 100644
index 9464ec6b436b79f015f50279aed2ed38e32d5909..d5ad02c1fa2b840289d316400952aaebb8c5dad1 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3089,5 +3089,21 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3118,5 +3118,21 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Clears all debug block highlights
*/
void clearBlockHighlights();

22
patches/server/0001-Pufferfish-Server-Changes.patch
View File

@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/build.gradle.kts b/build.gradle.kts
index d5d49bb2b47c889e12d17dc87b8c439a60b3fe67..5752339f2d081c36944d568e0b29ec4fe24f37f9 100644
index 781609605d25283009e5f3e61649ecde9ea9a4cb..80f9b35413552c4aba3ba01a95290c55f4e77106 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,8 +7,12 @@ plugins {
@ -1533,7 +1533,7 @@ index 710ca7d3a5659953f64bc6dccdd93b43300961cc..68d16efaf9c2d997afabadcf1ee24c5d
}
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 51b3db0b6c2cede95b584268e035c0fb36d38094..673fb3955291407be37dc78be4eec9bf2018128b 100644
index a7e133f3495e9132a5fdae2c24f225e7b026295a..ad4fdbdcf09f30d10e61ccf47f8fb9ce6bd92e73 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -221,6 +221,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@ -1545,7 +1545,7 @@ index 51b3db0b6c2cede95b584268e035c0fb36d38094..673fb3955291407be37dc78be4eec9bf
this.setPvpAllowed(dedicatedserverproperties.pvp);
this.setFlightAllowed(dedicatedserverproperties.allowFlight);
@@ -332,6 +334,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -339,6 +341,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
DedicatedServer.LOGGER.info("JMX monitoring enabled");
}
@ -1787,7 +1787,7 @@ index 54c2b7fba83d6f06dba95b1bb5b487a02048d6e6..53198ebfa30273c5ddc1bb4324f5174f
this.getRandomBlockPosition(j, 0, k, 15, blockposition);
int normalY = chunk.getHeight(Heightmap.Types.MOTION_BLOCKING, blockposition.getX() & 15, blockposition.getZ() & 15) + 1;
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 50d8d16b1856c0c875ccabbcfc240379a7669559..c89e430cfddb431ee1d20e59f8bd60e3a3a952b9 100644
index 9b0b42add71172bd154226e51d62cebd8de3542e..d04a30ee940a785b848240ae6b1aa9705deb7902 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1204,6 +1204,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@ -1919,7 +1919,7 @@ index 540bc9500c35c0db719b00aa26f6fb3a1b08ed9f..806cb760822a99316b08ad95ff8922df
int LARGE_MAX_STACK_SIZE = 64;
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 7555b04dcf274bb624b89f2eb9ff80da0056de4e..6a9c0f0b4b749c5907a274d6a83254284d8763bb 100644
index 1eaab1f6923e6aa34b643293347348e5cc19af3c..3073b34a0e0281b6b0330721bb0440147de28511 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -291,7 +291,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@ -2113,7 +2113,7 @@ index 7555b04dcf274bb624b89f2eb9ff80da0056de4e..6a9c0f0b4b749c5907a274d6a8325428
if (vec3d.length() > 0.0D) {
if (k1 > 0) {
diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
index e5cd4b7609243669c9d84ff8a4988c209e6101aa..4f3708f5f5dcb6af8225bda1cc9204a6d974665f 100644
index 41ff954010c11d524ffb90abd22c29a1d8d8f5a0..ac7ee31f2bfe5d4139b793a698317db50b39fe40 100644
--- a/src/main/java/net/minecraft/world/entity/EntityType.java
+++ b/src/main/java/net/minecraft/world/entity/EntityType.java
@@ -293,6 +293,8 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
@ -2126,7 +2126,7 @@ index e5cd4b7609243669c9d84ff8a4988c209e6101aa..4f3708f5f5dcb6af8225bda1cc9204a6
private String descriptionId;
@Nullable
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 529ea9094c0c7b6263c13b3b7a2d1e652f7bc29e..120c0804010fd5b38a5f806ca580962ff8b47339 100644
index 42eb78830855d7282b7f3f1bdbe85e632d489784..413652284e229a51e3eefe47f239e8fa9a09ccb2 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -143,7 +143,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@ -2622,7 +2622,7 @@ index 5bc033bf59d49eda1f8f2574165bbcbeab7faa0f..004091f2026f3c58d9bce49f1b07f644
return false;
}
diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
index 66476b33cede1e44db5ec166a0cea81f82ffe47a..5ccd7dc0a093277d3ea09c0fe8be03c0073ee1a8 100644
index 893975e8587b9036f622e2088c302e33004496d2..a000834c4ea8645a2fcd697e6396f797c42c8fa3 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
+++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
@@ -43,6 +43,36 @@ public abstract class Projectile extends Entity {
@ -2663,7 +2663,7 @@ index 66476b33cede1e44db5ec166a0cea81f82ffe47a..5ccd7dc0a093277d3ea09c0fe8be03c0
if (entity != null) {
this.ownerUUID = entity.getUUID();
diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
index b8fb7b5a347298ada16bc8b818edf1863e3f6040..43b4c4f9630bfa451d135139236ac6fce034ec15 100644
index cc74eeb45913fab03e85969957215d2811252a83..086feb19f11a6c646b5a1a06aef4df05a4beae8b 100644
--- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
+++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
@@ -27,7 +27,10 @@ import org.bukkit.inventory.InventoryHolder;
@ -3581,7 +3581,7 @@ index f7ea77dd82d978ad307f99c743efacfb34478b3d..009ab06182359862b8f543030ec4fe4e
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 17336102d37a5ab05c3b3c93fcf46961d0ffa7e2..a3c6b3dd87022e2def1f12da7c44c8d529191d1e 100644
index daeaa30cdd64f5cb775304e82f2390684c02a9d3..637564f7b662d8b86772f5ba96c0cb6bc6c5fa43 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -433,7 +433,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@ -3607,7 +3607,7 @@ index 774556a62eb240da42e84db4502e2ed43495be17..80553face9c70c2a3d897681e7761df8
if (stream != null) {
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index 1b42c98956342832c37f0aa266f85271daa4ba5b..b87756d9a7b04ea2613208984b2583eca3f32af6 100644
index e881584d38dc354204479863f004e974a0ac6c07..63d3fcc45be732a4cd2dc8b5347d860fd6577bdd 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -38,6 +38,10 @@ import co.aikar.timings.MinecraftTimings;

21
patches/server/0003-Rebrand.patch
View File

@ -192,25 +192,6 @@ index 68d16efaf9c2d997afabadcf1ee24c5de685b5b3..861cd9f092a19aca520c2be4ba7a6ee3
}
public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 673fb3955291407be37dc78be4eec9bf2018128b..c3221e8088bc53c8c229961adecbf60255eb8c79 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -280,11 +280,12 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
DedicatedServer.LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
DedicatedServer.LOGGER.warn("The server will make no attempt to authenticate usernames. Beware.");
// Spigot start
- if (org.spigotmc.SpigotConfig.bungee) {
- DedicatedServer.LOGGER.warn("Whilst this makes it possible to use BungeeCord, unless access to your server is properly restricted, it also opens up the ability for hackers to connect with any username they choose.");
+ if (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode()) { // Purpur
+ DedicatedServer.LOGGER.warn("Whilst this makes it possible to use BungeeCord or Velocity, unless access to your server is properly restricted, it also opens up the ability for hackers to connect with any username they choose."); // Purpur
DedicatedServer.LOGGER.warn("Please see http://www.spigotmc.org/wiki/firewall-guide/ for further information.");
} else {
DedicatedServer.LOGGER.warn("While this makes the game possible to play without internet access, it also opens up the ability for hackers to connect with any username they choose.");
+ DedicatedServer.LOGGER.warn("You will not be offered any support as long as the server allows offline-mode players to join."); // Purpur
}
// Spigot end
DedicatedServer.LOGGER.warn("To change this, set \"online-mode\" to \"true\" in the server.properties file.");
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 7930217aa1275c4ae70f180d483a8714d43027e8..fe1833142d94b5c4c2b8d2295cf231422ac80dcb 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@ -252,7 +233,7 @@ index 4e56018b64d11f76c8da43fd8f85c6de72204e36..aa8212432825db65cf485cd93f734ccd
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index f2a7a10df4c283ef3d7e44121c074156556c9cf2..4439b42c97bef076efa8ec99da382414d3c522dc 100644
index 2cff68a5c448c0e971d95e9264223eb943730968..db5952e97c5ff5c258760b70592f9ad470ce401c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -883,7 +883,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {

6
patches/server/0005-Purpur-client-support.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Purpur client support
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 7d6d3c8556033d289fdadc489e73fba478fce41a..c2ff5d7e4a9f7477b7b207e9d3fb724137a35f11 100644
index 9160725f031c9698a00229c3dfa19d39b4a826c1..74d332479556ec01cc3fb8d13fe82a77e2fbf3e9 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -268,6 +268,7 @@ public class ServerPlayer extends Player {
@ -43,10 +43,10 @@ index d04a30ee940a785b848240ae6b1aa9705deb7902..9c5f191205b5f413890e78e316a08e6f
try {
byte[] data = new byte[packet.data.readableBytes()];
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 603cc41df6bcf726d996427e47876299d05d44db..09a806702d39fe4d7e7c5668afbd4168382d0854 100644
index 03430916a8107c1b0f04d84e1dce494e2da06e7a..b3135e6d66fe8f176a98adb8230e788c4c0d662e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3048,4 +3048,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3058,4 +3058,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.spigot;
}
// Spigot end

8
patches/server/0012-AFK-API.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] AFK API
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index f6360f2973c03e0105361f9e001360ec01488ce6..e40144aad9182ccb2ed871d74378cf0af783c9f1 100644
index e036f9d554a5871a56f21917a8222a6463f594b0..7107c727d241859c475d609974e3bb3fb7f15974 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2051,8 +2051,63 @@ public class ServerPlayer extends Player {
@ -187,7 +187,7 @@ index e752c83df50fb9b670ecea2abc95426c2a009b6f..baa4f9026d31de92210300ecb8ee8c1b
if (baseEntity == null) {
if (this.isCombat && (!targetEntity.canBeSeenAsEnemy() || targetEntity.level.getDifficulty() == Difficulty.PEACEFUL)) {
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index 67029969f5bb644909a7114694e7665fd2b32ced..bf89ac6162549cc50356e7f015abd8a2670a316c 100644
index a0cd61f73bdc50cd29125c5e3f9fc47c3c3c5608..8f85d5c09b36610cb8ffa9032818933ab30e5fad 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -198,6 +198,13 @@ public abstract class Player extends LivingEntity {
@ -218,7 +218,7 @@ index 3b959f42d958bf0f426853aee56753d6c455fcdb..d17abb283ea818244df0379d6b57fc63
if (range < 0.0D || d < range * range) {
return true;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 09a806702d39fe4d7e7c5668afbd4168382d0854..707751397ee385348411c393181115da5a7d9d28 100644
index b3135e6d66fe8f176a98adb8230e788c4c0d662e..7c5cab418adbac2d8e84338e7851b6b626840d5a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -524,10 +524,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -238,7 +238,7 @@ index 09a806702d39fe4d7e7c5668afbd4168382d0854..707751397ee385348411c393181115da
for (ServerPlayer player : (List<ServerPlayer>) server.getHandle().players) {
if (player.getBukkitEntity().canSee(this)) {
player.connection.send(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_DISPLAY_NAME, this.getHandle()));
@@ -3054,5 +3059,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3064,5 +3069,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public boolean usesPurpurClient() {
return getHandle().purpurClient;
}

6
patches/server/0018-Player-invulnerabilities.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index e40144aad9182ccb2ed871d74378cf0af783c9f1..8e6c0ab117f7c79e51470a136499521723d5d411 100644
index 7107c727d241859c475d609974e3bb3fb7f15974..36e05a3bec0bc9cfb5048e2f040ebb9708408c8e 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -269,6 +269,7 @@ public class ServerPlayer extends Player {
@ -121,10 +121,10 @@ index c8dedd2bfcc633ac1be891c8016dc9384e199796..0e09db289dadb812faf6850d6cbaf202
return entityplayer1;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 707751397ee385348411c393181115da5a7d9d28..6952f036976981c0007e917b6668ecbafc44618c 100644
index 7c5cab418adbac2d8e84338e7851b6b626840d5a..81af78fcd88ca1fa00e206895093ee52772be502 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3074,5 +3074,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3084,5 +3084,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetLastActionTime();
}

8
patches/server/0121-Implement-TPSBar.patch
View File

@ -29,10 +29,10 @@ index 1953eaab247d7482773cac79dafd651a23dff2da..33975783ec484d7d67851d69b5f3c85e
this.hasLoggedStop = true; // Paper
if (isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Server stopped"); // Paper
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 44be589011acb90c0d662cb1eb2697cfefd7fba5..f0d4e4e98148fabeb90ae6a22855ed0c8d49d08a 100644
index ca6a2fee12ac8a89dae57aa2787462f190463cd0..d1fcdddbc1b08679e17407ca12934350a3d1b882 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -345,6 +345,9 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -351,6 +351,9 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
}
if (gg.pufferfish.pufferfish.PufferfishConfig.enableAsyncMobSpawning) mobSpawnExecutor.start(); // Pufferfish
@ -43,7 +43,7 @@ index 44be589011acb90c0d662cb1eb2697cfefd7fba5..f0d4e4e98148fabeb90ae6a22855ed0c
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index d0a76519d85d4c9e4dc0b98d038a4c447ce5e833..62fa71b3f9fe488c3b7d44d5c294894744317b96 100644
index 792548064ae3b633fd1a2a975957a932ef7ac2d7..b27ca203c7e581faca92cf8169cb2b04629bf093 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -270,6 +270,7 @@ public class ServerPlayer extends Player {
@ -85,7 +85,7 @@ index d0a76519d85d4c9e4dc0b98d038a4c447ce5e833..62fa71b3f9fe488c3b7d44d5c2948947
// Purpur end
}
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index f2cfcefefaf71ba0f49a1aea34886fd9cb7b69e2..fb06e34821db74a4af4bd56392a5aaae839a8387 100644
index 52bf4eda9b74086fcf8177e781c246fa5f364cfc..91e8e4cf82cb2c6cff17a6c588a7ffdb0b4da75e 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -455,6 +455,7 @@ public abstract class PlayerList {

4
patches/server/0128-Add-EntityTeleportHinderedEvent.patch
View File

@ -93,10 +93,10 @@ index ba898640a8f693e8bae43281b170d3505154b273..39ae7bdac23601c567013799375bf32b
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index f157474b26ffea3c9ec5aa3f5c8a5f3c786a6bb5..e9dd10fcf1db1204f905ebeecfa0fccb83717205 100644
index 81af78fcd88ca1fa00e206895093ee52772be502..465bec29cbaf3a1767a7171a69f0411054e63785 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1294,6 +1294,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1304,6 +1304,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
if (entity.isVehicle() && !ignorePassengers) { // Paper - Teleport API

4
patches/server/0216-Extended-OfflinePlayer-API.patch
View File

@ -223,10 +223,10 @@ index 714afc98b5150907b45a00060be4e41582333204..312a6d90c0a09570aef24c205dc2ff27
+ // Purpur end - OfflinePlayer API
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index d18ad566ba82c5b02614050eb8c679836eda73b6..8d7c37784cdec81a9dab4d605dd2fee0e9b357bb 100644
index 465bec29cbaf3a1767a7171a69f0411054e63785..ddf2c679ada43bfb209656dbcaca0fa8aef8ed24 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2264,6 +2264,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2274,6 +2274,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.getHandle().getAbilities().walkingSpeed * 2f;
}

4
patches/server/0243-Give-bee-counts-in-beehives-to-Purpur-clients.patch
View File

@ -17,10 +17,10 @@ index d56e19925bff15d26dd40463c6945de468bbbce2..15285d2b132a82a7b7f9c2c558e1157b
this.hasLoggedStop = true; // Paper
if (isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Server stopped"); // Paper
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index e5ed4f5e0b92c34a201087af1b1d68d53c460831..f07bc9e76b5bf9025dfdecad7408e8b3cbb8c9d1 100644
index 0dd6c1a75cdb9492c109fc9dc771df18fb3b95f7..a9010814085c4a9102613f013cd727f19349b440 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -371,6 +371,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -377,6 +377,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
if (gg.pufferfish.pufferfish.PufferfishConfig.enableAsyncMobSpawning) mobSpawnExecutor.start(); // Pufferfish
org.purpurmc.purpur.task.BossBarTask.startAll(); // Purpur

10
patches/server/0278-Remove-Timings.patch
View File

@ -238,10 +238,10 @@ index 6483a1d461904a0584b6808b2f86ac7329bba963..f662278d302661e57c850529ede81ea2
i = this.context.runTopCommand(function, source);
} finally {
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index f07bc9e76b5bf9025dfdecad7408e8b3cbb8c9d1..14c31ac94202e5266610869d3dd93b871cfb4557 100644
index a9010814085c4a9102613f013cd727f19349b440..32fd6f8ed7acb3a178e3026e88ba24fd601fa4e9 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -519,7 +519,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -525,7 +525,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
}
public void handleConsoleInputs() {
@ -250,7 +250,7 @@ index f07bc9e76b5bf9025dfdecad7408e8b3cbb8c9d1..14c31ac94202e5266610869d3dd93b87
// Paper start - use proper queue
ConsoleInput servercommand;
while ((servercommand = this.serverCommandQueue.poll()) != null) {
@@ -536,7 +536,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -542,7 +542,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
// CraftBukkit end
}
@ -645,7 +645,7 @@ index 077ff3d7620e3c48aca59a92014dbdb7de15e79a..ece55efcd566bcb9b06d305496ab7458
} else if (close) { chunkproviderserver.close(false); } // Paper - rewrite chunk system
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 6709f4647cd3f917b9cc6d44a59edcb1a9d6b258..44343b433dc18649e10980c83b155d84adeeee05 100644
index 3f547b68a304d47249162154e11ebe6528f5ecea..d468bb5e61ba25cfb2b462e2d0852256c64034d6 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2577,7 +2577,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@ -676,7 +676,7 @@ index 6709f4647cd3f917b9cc6d44a59edcb1a9d6b258..44343b433dc18649e10980c83b155d84
}
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 47a2c5eb799580501f5b31c85a569fa342646d8b..b0fa557e756d1e30097ad5a72e679d8844b34cd9 100644
index 03a1e1a9af8ed6ac922748a685a180defcb85997..c34c5368e336ba4b181a95932a9b40cb4f50ae1d 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1226,7 +1226,7 @@ public abstract class PlayerList {

4
patches/server/0282-Debug-Marker-API.patch
View File

@ -99,10 +99,10 @@ index ba570a518f2bcdb23fd2118663c2b82e7484629d..9b5323edd99848b73ea0e34230e7bec8
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 8d7c37784cdec81a9dab4d605dd2fee0e9b357bb..d31255de3f0ea8839cadde3d9bfd80f37a6b1bc4 100644
index ddf2c679ada43bfb209656dbcaca0fa8aef8ed24..660a2a8d17325014cc3f8ba33faaadc6fb5b80eb 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3115,5 +3115,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3125,5 +3125,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
}

4
patches/server/0287-Add-death-screen-API.patch
View File

@ -30,10 +30,10 @@ index 53b75f5737a910ffc5448cd9a85eae57f9c1488f..ea95873dd034779e56a8b924cd27f937
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index d31255de3f0ea8839cadde3d9bfd80f37a6b1bc4..4390514f6c6ee214efdd014c261f480700c1f8b8 100644
index 660a2a8d17325014cc3f8ba33faaadc6fb5b80eb..b2e4eac89fb2dc223c2b2ae8e36fe430f3f689c5 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3158,5 +3158,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3168,5 +3168,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
if (this.getHandle().connection == null) return;
this.getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket(ClientboundCustomPayloadPacket.DEBUG_GAME_TEST_CLEAR, new FriendlyByteBuf(io.netty.buffer.Unpooled.buffer())));
}