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@ea0b639 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9228)
PaperMC/Paper@2eda177 Expand PlayerItemMendEvent (#7382)
PaperMC/Paper@bacbf86 Fixes and additions to projectile API (#9237)
PaperMC/Paper@8a18fc5 [ci skip] add 'needs triage' label to invalid on issue close (#9252)
PaperMC/Paper@d8d3bd7 [ci skip] Add missing deprecations for legacy MaterialData api (#9253)
This commit is contained in:
granny 2023-06-04 00:18:33 -07:00
parent d6cfa8f939
commit 6d7bb23341
No known key found for this signature in database
37 changed files with 114 additions and 114 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.4-R0.1-SNAPSHOT
paperCommit = fa8fa1ce083521e7328dec8af97751d4bd9cebe6
paperCommit = d8d3bd70b03f47f081d19860391e4c8b0963a5ef
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 9cd49bf6db451af67cd15c8857d7bf51a4e1a67a..1c3c988d314b3a229ff8addcacb935500be1a4ca 100644
index 88c4885569d2b8b22fce55601d50608ac8e9388c..8d6353aa965474cf6bf333741abd7a059aa26d57 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3057,4 +3057,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3068,4 +3068,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 1c3c988d314b3a229ff8addcacb935500be1a4ca..f8d06c55ae7b5c9de05cfdf5bdeaf94e6eb04209 100644
index 8d6353aa965474cf6bf333741abd7a059aa26d57..deda8a924742401c21d098406cbe7d07ab91faba 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3065,5 +3065,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3076,5 +3076,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 f8d06c55ae7b5c9de05cfdf5bdeaf94e6eb04209..13262d8a500f476a6035ee2c2f976c5f6f5a8263 100644
index deda8a924742401c21d098406cbe7d07ab91faba..53c536f0b828c2dbfc426c367d3b4e1d92944338 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3084,5 +3084,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3095,5 +3095,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Reset the idle timer back to 0
*/
void resetIdleTimer();

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

@ -260,10 +260,10 @@ index 9b5cd8a33bae463872efecaca0829b7d2b434529..4561ca02052d774bc1424f7044c34f7a
/**
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 13262d8a500f476a6035ee2c2f976c5f6f5a8263..c3e4635c388fcf364c65d5c1ce2ce1f701012e05 100644
index 53c536f0b828c2dbfc426c367d3b4e1d92944338..a003254281a07505cdd929fa9ee443749e48d5eb 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3105,5 +3105,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3116,5 +3116,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param invulnerableTicks Invulnerable ticks remaining
*/
void setSpawnInvulnerableTicks(int invulnerableTicks);

4
patches/api/0047-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 c3e4635c388fcf364c65d5c1ce2ce1f701012e05..838f32eb3397d847071f54648dbac02c35d621cf 100644
index a003254281a07505cdd929fa9ee443749e48d5eb..dc437885404ae147a06cac653e519a4674a9a951 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3175,5 +3175,21 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3186,5 +3186,21 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Clears all debug block highlights
*/
void clearBlockHighlights();

26
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 9cf389defdaeb887e9cad4f0fed3f3b95667b238..b41b186397d013c19436c345be98b785d4bd0295 100644
index 4f2fa65ade89c5703451dad4f80eeef162b277d1..3ee1160c796cc86db9bc9438055b307239e9a8f7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,8 +7,12 @@ plugins {
@ -1875,7 +1875,7 @@ index 04b1531572e8fff1e46fe1c94e7fc863841e0f66..47ddc42f2b63d9d3fae5ae6ea93d4183
int LARGE_MAX_STACK_SIZE = 64;
int DEFAULT_DISTANCE_LIMIT = 8;
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index df316ca580a0a3b4ba6b658f7d7bdf542f4ad85b..1030b54428b15f387580a2ce47a7a1eb0c8d521b 100644
index 280ee1838106201f5e3ba7753caced6d030f7e55..b4ab2cfb7a5fa0d2efd1a759d754d5203aaac077 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -292,7 +292,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@ -1887,7 +1887,7 @@ index df316ca580a0a3b4ba6b658f7d7bdf542f4ad85b..1030b54428b15f387580a2ce47a7a1eb
private ChunkPos chunkPosition;
private Vec3 deltaMovement;
private float yRot;
@@ -416,6 +416,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -417,6 +417,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return this.originWorld;
}
// Paper end
@ -1900,7 +1900,7 @@ index df316ca580a0a3b4ba6b658f7d7bdf542f4ad85b..1030b54428b15f387580a2ce47a7a1eb
public float getBukkitYaw() {
return this.yRot;
}
@@ -490,17 +496,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -491,17 +497,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
this.isLegacyTrackingEntity = isLegacyTrackingEntity;
}
@ -1938,7 +1938,7 @@ index df316ca580a0a3b4ba6b658f7d7bdf542f4ad85b..1030b54428b15f387580a2ce47a7a1eb
for (Entity passenger : passengers) {
org.spigotmc.TrackingRange.TrackingRangeType passengerType = passenger.trackingRangeType;
int passengerRange = chunkMap.getEntityTrackerRange(passengerType.ordinal());
@@ -509,6 +534,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -510,6 +535,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
range = passengerRange;
}
}
@ -1948,7 +1948,7 @@ index df316ca580a0a3b4ba6b658f7d7bdf542f4ad85b..1030b54428b15f387580a2ce47a7a1eb
return chunkMap.playerEntityTrackerTrackMaps[type.ordinal()].getObjectsInRange(MCUtil.getCoordinateKey(this));
}
@@ -790,6 +818,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -791,6 +819,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
// CraftBukkit end
public void baseTick() {
@ -1961,7 +1961,7 @@ index df316ca580a0a3b4ba6b658f7d7bdf542f4ad85b..1030b54428b15f387580a2ce47a7a1eb
this.level.getProfiler().push("entityBaseTick");
if (firstTick && this instanceof net.minecraft.world.entity.NeutralMob neutralMob) neutralMob.tickInitialPersistentAnger(level); // Paper - Update last hurt when ticking
this.feetBlockState = null;
@@ -4163,16 +4197,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4164,16 +4198,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@ -1987,7 +1987,7 @@ index df316ca580a0a3b4ba6b658f7d7bdf542f4ad85b..1030b54428b15f387580a2ce47a7a1eb
double d1 = 0.0D;
boolean flag = this.isPushedByFluid();
boolean flag1 = false;
@@ -4180,14 +4216,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4181,14 +4217,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
int k1 = 0;
BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
@ -2055,7 +2055,7 @@ index df316ca580a0a3b4ba6b658f7d7bdf542f4ad85b..1030b54428b15f387580a2ce47a7a1eb
if (d2 >= axisalignedbb.minY) {
flag1 = true;
@@ -4209,9 +4292,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4210,9 +4293,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
// CraftBukkit end
}
}
@ -2578,7 +2578,7 @@ index 27c028ab6b1edb6e413af3bbaa27bf30f2d85540..302ca7391109c10e81a7745504b3c530
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 8b2a3a8482018b7db7de81bc295862f783e17ce5..e6f87e1e3c99195ed11c81162cb54e7f5750c4ba 100644
index a211ca048dddc75afce1f83ee1700bad66e457fc..85260fd93ca8d5ffd0ba7a98f1d47093d58f0f87 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
+++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
@@ -44,6 +44,36 @@ public abstract class Projectile extends Entity implements TraceableEntity {
@ -3431,10 +3431,10 @@ index ebe65474a4a05ff1637d7f37ebcfe690af59def5..42142c512b12e5b269c19f1e821c50e7
@Nullable
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 67dbfa6b384af45837d3aa29e249fd4bf92ee8fb..f025905a7afae894401638a8842a4a44fa41d1ef 100644
index 894c0d5bfa001def4374b657e3eb8f15a0caa1e9..a49520fbb3cbce866338c964dd0aadbd113bf411 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -257,7 +257,7 @@ import javax.annotation.Nullable; // Paper
@@ -259,7 +259,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper
public final class CraftServer implements Server {
@ -3443,7 +3443,7 @@ index 67dbfa6b384af45837d3aa29e249fd4bf92ee8fb..f025905a7afae894401638a8842a4a44
private final String serverVersion;
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
@@ -1040,6 +1040,11 @@ public final class CraftServer implements Server {
@@ -1042,6 +1042,11 @@ public final class CraftServer implements Server {
plugin.getPluginMeta().getDisplayName(),
"This plugin is not properly shutting down its async tasks when it is being shut down. This task may throw errors during the final shutdown logs and might not complete before process dies."
));

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

@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
diff --git a/build.gradle.kts b/build.gradle.kts
index b41b186397d013c19436c345be98b785d4bd0295..22470f0ab8354a9f31a0f195f3fe80f2f5ee2f0e 100644
index 3ee1160c796cc86db9bc9438055b307239e9a8f7..9c01005751c0088f560f96401cdfdebbbda4e7ec 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,12 +7,8 @@ plugins {
@ -197,10 +197,10 @@ index a29d92b3f2658b63545b25092bb3a1fea46ca36b..0f6d1c56efbab0f9b84f09f7dc27eb70
public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index e38391da44a1b5e3b845eba2d80453021a1e0c25..fa82680d6b8a28668b25b32bcbd34bddc9565c9c 100644
index a49520fbb3cbce866338c964dd0aadbd113bf411..fb5219a1bba455bde715601472dbec4ee0b8ca81 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -257,7 +257,7 @@ import javax.annotation.Nullable; // Paper
@@ -259,7 +259,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper
public final class CraftServer implements Server {

10
patches/server/0004-Purpur-config-files.patch
View File

@ -112,10 +112,10 @@ index 66cc44d9f14b01f6c8e53b0f990866ac897c1c81..c38aff50c6f0bc37e539bb4d5206f7b6
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index fa82680d6b8a28668b25b32bcbd34bddc9565c9c..700e6af9919af1b38bb725d2f99e952df17eb31a 100644
index fb5219a1bba455bde715601472dbec4ee0b8ca81..d706bb0387aaf4201158b1940680f9c2d1acd743 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -957,6 +957,7 @@ public final class CraftServer implements Server {
@@ -959,6 +959,7 @@ public final class CraftServer implements Server {
org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
this.console.paperConfigurations.reloadConfigs(this.console);
@ -123,7 +123,7 @@ index fa82680d6b8a28668b25b32bcbd34bddc9565c9c..700e6af9919af1b38bb725d2f99e952d
for (ServerLevel world : this.console.getAllLevels()) {
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
@@ -972,6 +973,7 @@ public final class CraftServer implements Server {
@@ -974,6 +975,7 @@ public final class CraftServer implements Server {
}
}
world.spigotConfig.init(); // Spigot
@ -131,7 +131,7 @@ index fa82680d6b8a28668b25b32bcbd34bddc9565c9c..700e6af9919af1b38bb725d2f99e952d
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -987,6 +989,7 @@ public final class CraftServer implements Server {
@@ -989,6 +991,7 @@ public final class CraftServer implements Server {
this.reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
@ -139,7 +139,7 @@ index fa82680d6b8a28668b25b32bcbd34bddc9565c9c..700e6af9919af1b38bb725d2f99e952d
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2746,6 +2749,18 @@ public final class CraftServer implements Server {
@@ -2748,6 +2751,18 @@ public final class CraftServer implements Server {
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
}

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

@ -43,10 +43,10 @@ index 9d2d72fe48b69be2f6ebe74309673a3a4e51eae4..299d43f714637beb6cdce186368c4171
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 f3e1ba16446ff569f178a4bd16d328e8c2f0e40c..7dd5879f8f4938c2742bde1e58b06f9b909fc389 100644
index be64633c8bcee96f2ad5247525cac965b7b031b1..39ab19be66530c4792719d2d86b6979cffedcf83 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3174,4 +3174,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3180,4 +3180,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.spigot;
}
// Spigot end

6
patches/server/0007-Component-related-conveniences.patch
View File

@ -36,7 +36,7 @@ index 61b818e93de53ef14b9b928193da9b6fea3ff003..74e2731c614e0387de8eee93af005c7c
public void displayClientMessage(Component message, boolean overlay) {
this.sendSystemMessage(message, overlay);
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 5c21de0d48fba88c3164b72e0eb624706b683fab..0e75163468ab91e7c6d245577041c288a9d865ac 100644
index 92e758a286a5db079c32d53cc52c8a422457daef..7942c33f3ec34ec2c6cccef6bfd22f7a691d00b2 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1029,6 +1029,20 @@ public abstract class PlayerList {
@ -81,10 +81,10 @@ index 93a1e990b0a6caae4143c2f9d09bfb368fa1d6db..615611fe372d6edaef56db058bbf2cf7
return this.type().msgId();
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 1030b54428b15f387580a2ce47a7a1eb0c8d521b..7238a6e3ffdbd7421ed978e007d256aaad84ea58 100644
index b4ab2cfb7a5fa0d2efd1a759d754d5203aaac077..3576c00873127e9d22916156bee620ca4ad00b74 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3915,6 +3915,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3916,6 +3916,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return SlotAccess.NULL;
}

12
patches/server/0008-Ridables.patch
View File

@ -79,7 +79,7 @@ index 299d43f714637beb6cdce186368c4171cac74c4c..ec4891a736c5c91af7589071f87fa664
if ((entity instanceof Bucketable && entity instanceof LivingEntity && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
entity.getEntityData().resendPossiblyDesyncedEntity(player); // Paper - The entire mob gets deleted, so resend it.
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 7238a6e3ffdbd7421ed978e007d256aaad84ea58..546ae68177a3188efe911aa535e058ae69341818 100644
index 3576c00873127e9d22916156bee620ca4ad00b74..15429602894741c420cea12a0afa979ca28e5d34 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -362,7 +362,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@ -91,7 +91,7 @@ index 7238a6e3ffdbd7421ed978e007d256aaad84ea58..546ae68177a3188efe911aa535e058ae
private float eyeHeight;
public boolean isInPowderSnow;
public boolean wasInPowderSnow;
@@ -2823,6 +2823,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2824,6 +2824,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
this.passengers = ImmutableList.copyOf(list);
}
@ -105,7 +105,7 @@ index 7238a6e3ffdbd7421ed978e007d256aaad84ea58..546ae68177a3188efe911aa535e058ae
this.gameEvent(GameEvent.ENTITY_MOUNT, entity);
}
return true; // CraftBukkit
@@ -2864,6 +2871,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2865,6 +2872,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return false;
}
// Spigot end
@ -120,7 +120,7 @@ index 7238a6e3ffdbd7421ed978e007d256aaad84ea58..546ae68177a3188efe911aa535e058ae
if (this.passengers.size() == 1 && this.passengers.get(0) == entity) {
this.passengers = ImmutableList.of();
} else {
@@ -4738,4 +4753,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4739,4 +4754,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
}
// Paper end
@ -5153,7 +5153,7 @@ index 56c75029a94e8812c9e0ce5375aaa7cbcda90b87..a4644b1d9abb7ffeda89801e4562a078
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 221f5088953b3452966d07eabd4ea8b38c465fd9..bfb8039a65fbfdb6d2fa6fc4fdeb146fbc4e147f 100644
index a153c134cf26e86d49ef419eca35994539af0db3..e9599e0f3d2122c3843ebde81743bc8d558bfd30 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -563,6 +563,15 @@ public class CraftEventFactory {
@ -5197,7 +5197,7 @@ index 221f5088953b3452966d07eabd4ea8b38c465fd9..bfb8039a65fbfdb6d2fa6fc4fdeb146f
event = new EntityDamageEvent(damagee.getBukkitEntity(), cause, modifiers, modifierFunctions);
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 43884d28fe27962a5ca895315849318975cb3011..943b65dd5169946d5fec86e3fc38076cae47ba58 100644
index 9fe1cdafdafc3f718ef4eb4fd4150971e2832738..0cab29584c4d5205950571660b6c271d34e403eb 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -172,4 +172,9 @@ public class PurpurConfig {

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

@ -218,10 +218,10 @@ 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 7dd5879f8f4938c2742bde1e58b06f9b909fc389..3758bdbca76fe04309408ae2131ef3e7a3f82e6a 100644
index 39ab19be66530c4792719d2d86b6979cffedcf83..2fd1eb97d70890efe431af32f47db29bdab60aa3 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -533,10 +533,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -534,10 +534,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public void setPlayerListName(String name) {
@ -238,7 +238,7 @@ index 7dd5879f8f4938c2742bde1e58b06f9b909fc389..3758bdbca76fe04309408ae2131ef3e7
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()));
@@ -3180,5 +3185,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3186,5 +3191,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public boolean usesPurpurClient() {
return getHandle().purpurClient;
}

4
patches/server/0013-Bring-back-server-name.patch
View File

@ -17,10 +17,10 @@ index 818289e831e3dad29345c43265e2efd7689bc500..1ea3012995c738c67b31e997c138f824
public final boolean spawnNpcs = this.get("spawn-npcs", true);
public final boolean pvp = this.get("pvp", true);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 30b50785fd18610bb418992aafe5fa24ec78780d..7104df35cf3de47026ae339a5e5f0ca211c3b08c 100644
index d706bb0387aaf4201158b1940680f9c2d1acd743..c4c0cfa2530bab3d898603f2335ffe92460431b6 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2974,4 +2974,11 @@ public final class CraftServer implements Server {
@@ -2976,4 +2976,11 @@ public final class CraftServer implements Server {
}
// Paper end

4
patches/server/0016-Lagging-threshold.patch
View File

@ -25,10 +25,10 @@ index 57f6de7872bfa80cf7668524975946cbd7fcda56..6cdcd4f105b15f10d60499572f6f4f83
}
// Spigot end
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 7104df35cf3de47026ae339a5e5f0ca211c3b08c..553df241cde2fb53c9b061f3fc54136d4a67a633 100644
index c4c0cfa2530bab3d898603f2335ffe92460431b6..5805da6b1322d6be5067aeab91be90c02997f7c8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2980,5 +2980,10 @@ public final class CraftServer implements Server {
@@ -2982,5 +2982,10 @@ public final class CraftServer implements Server {
public String getServerName() {
return this.getProperties().serverName;
}

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

@ -121,10 +121,10 @@ index bf6d6d7a587d05f38952b22774933d9a45f8365e..e73c77cfd61cdaebf4effe302f2a25bf
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 3758bdbca76fe04309408ae2131ef3e7a3f82e6a..29b449f9b7830346004636fd7d4488f6070f16e0 100644
index 2fd1eb97d70890efe431af32f47db29bdab60aa3..e323c7238e481e9e64748792f734a40dcab9e6f6 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3200,5 +3200,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3206,5 +3206,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetLastActionTime();
}

4
patches/server/0056-Configurable-void-damage-height-and-damage.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Configurable void damage height and damage
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index de4e0d9ca36aa1b75005ad3dcd9b9910b89fc5f1..8bf194c2db3f775405c7117c6882ecd398922c2a 100644
index 40d71ea65892910e5e9382591248aa337e9ab07c..7d6040eebf4789c136f10a28ee6a2fe687973986 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -894,7 +894,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -895,7 +895,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
public void checkOutOfWorld() {
// Paper start - Configurable nether ceiling damage

4
patches/server/0057-Add-canSaveToDisk-to-Entity.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Add canSaveToDisk to Entity
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 8bf194c2db3f775405c7117c6882ecd398922c2a..a617879ca6c819c40c21df3519f106620220a70e 100644
index 7d6040eebf4789c136f10a28ee6a2fe687973986..7260fc2adc222a6fc5c64ba9ba01ee91051accb8 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4793,5 +4793,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4794,5 +4794,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
public boolean processClick(InteractionHand hand) {
return false;
}

4
patches/server/0061-Add-5-second-tps-average-in-tps.patch
View File

@ -69,10 +69,10 @@ index ceaafede643bac0b6714df3d5475b4cb03b2eaed..65ba915d3644b638ce3b5314c0aed5b2
lagging = recentTps[0] < org.purpurmc.purpur.PurpurConfig.laggingThreshold; // Purpur
tickSection = curTime;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 14a5f137a9f925926406ea2a6b113fef88378c2e..a78bc6977e37c2eaa61b1618a386feab1e4229c3 100644
index 5805da6b1322d6be5067aeab91be90c02997f7c8..6af3df960800a182f6d4e9cbf4ab5449ce35aaef 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2703,6 +2703,7 @@ public final class CraftServer implements Server {
@@ -2705,6 +2705,7 @@ public final class CraftServer implements Server {
@Override
public double[] getTPS() {
return new double[] {

4
patches/server/0087-Stop-squids-floating-on-top-of-water.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Stop squids floating on top of water
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index a617879ca6c819c40c21df3519f106620220a70e..fcaeeb8885e20cc8de51831b4fbfe827e5cc94a1 100644
index 7260fc2adc222a6fc5c64ba9ba01ee91051accb8..22656eea7e7d6b5e1f749db2f2209e5b8c362490 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4225,6 +4225,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4226,6 +4226,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
this.yRotO = this.getYRot();
}

6
patches/server/0089-Entities-can-use-portals-configuration.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Entities can use portals configuration
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index fcaeeb8885e20cc8de51831b4fbfe827e5cc94a1..489b124bcc7bd60830415563329f3567988ccf9b 100644
index 22656eea7e7d6b5e1f749db2f2209e5b8c362490..d1d2c0ea830fc3e4b5ac1be59a70fd551ad8c9b3 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2941,7 +2941,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2942,7 +2942,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
public void handleInsidePortal(BlockPos pos) {
if (this.isOnPortalCooldown()) {
this.setPortalCooldown();
@ -17,7 +17,7 @@ index fcaeeb8885e20cc8de51831b4fbfe827e5cc94a1..489b124bcc7bd60830415563329f3567
if (!this.level.isClientSide && !pos.equals(this.portalEntrancePos)) {
this.portalEntrancePos = pos.immutable();
}
@@ -3633,7 +3633,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3634,7 +3634,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
public boolean canChangeDimensions() {

4
patches/server/0125-Add-mobGriefing-bypass-to-everything-affected.patch
View File

@ -284,10 +284,10 @@ index 4daa368881e4fa59a9365d7b3810ae7dc1455fa3..a4041580061b2acd150836a1437df66e
// CraftBukkit start - fire ExplosionPrimeEvent
ExplosionPrimeEvent event = new ExplosionPrimeEvent((org.bukkit.entity.Explosive) this.getBukkitEntity());
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 e6f87e1e3c99195ed11c81162cb54e7f5750c4ba..220690cbd6552b06626f4edf5c71bed5cf1f12c4 100644
index 85260fd93ca8d5ffd0ba7a98f1d47093d58f0f87..505a60605ff2282f2c460c81464d60a433f41eda 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
+++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
@@ -307,6 +307,6 @@ public abstract class Projectile extends Entity implements TraceableEntity {
@@ -318,6 +318,6 @@ public abstract class Projectile extends Entity implements TraceableEntity {
public boolean mayInteract(Level world, BlockPos pos) {
Entity entity = this.getOwner();

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

@ -89,10 +89,10 @@ index a4644b1d9abb7ffeda89801e4562a078ffe43288..ef683027bc840999d70420b2d6c751ca
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 141b5428d65d7db133d59d76a214333e07620eee..10230658e2c3840af136bd90621992ed04551832 100644
index e323c7238e481e9e64748792f734a40dcab9e6f6..a87fc2fa8399a4f117ef966f482c693747d6b08b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1362,6 +1362,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1363,6 +1363,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
if (entity.isVehicle() && !ignorePassengers) { // Paper - Teleport API

4
patches/server/0129-Movement-options-for-armor-stands.patch
View File

@ -17,10 +17,10 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 489b124bcc7bd60830415563329f3567988ccf9b..a1be9f2cbc2d66f9d4c5a66dc8a620435f9073a5 100644
index d1d2c0ea830fc3e4b5ac1be59a70fd551ad8c9b3..c1112da2671095f0ebc69fcb28fff90cf1cd3025 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1746,7 +1746,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1747,7 +1747,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return this.isInWater() || flag;
}

6
patches/server/0130-Fix-stuck-in-portals.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Fix stuck in portals
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 06c225972d5a92296042ff612634f81298b32107..9610ab9ba4803f6841c797f740ac5cdc758a70e3 100644
index cbf30bd3fe91d2bc386af16a9322f50e12593c2b..cb12b41ec62e49c500491beaf3d7b49603ada88e 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1230,6 +1230,7 @@ public class ServerPlayer extends Player {
@ -17,10 +17,10 @@ index 06c225972d5a92296042ff612634f81298b32107..9610ab9ba4803f6841c797f740ac5cdc
// CraftBukkit end
this.setLevel(worldserver);
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index a1be9f2cbc2d66f9d4c5a66dc8a620435f9073a5..fe44c47c5dea658cb812923ecc284671a15d3d24 100644
index c1112da2671095f0ebc69fcb28fff90cf1cd3025..fa3258b69770d91aebbf181f5c19690e166f9df2 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2938,12 +2938,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2939,12 +2939,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return Vec3.directionFromRotation(this.getRotationVector());
}

4
patches/server/0150-Drowning-Settings.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Drowning Settings
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index fe44c47c5dea658cb812923ecc284671a15d3d24..4640f9659c501b7054a6f0034e49f4fe326ebdc9 100644
index fa3258b69770d91aebbf181f5c19690e166f9df2..7dbab470620b60f9d7adac0229649df6ef635f45 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3179,7 +3179,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3180,7 +3180,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
public int getMaxAirSupply() {

4
patches/server/0178-API-for-any-mob-to-burn-daylight.patch
View File

@ -6,10 +6,10 @@ Subject: [PATCH] API for any mob to burn daylight
Co-authored by: Encode42 <me@encode42.dev>
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 4640f9659c501b7054a6f0034e49f4fe326ebdc9..f24fb3607c836014a93fcab19ac68253d0cdb8b3 100644
index 7dbab470620b60f9d7adac0229649df6ef635f45..14ddffb3a936945095dbaeade48441cc439ef21f 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4806,5 +4806,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4807,5 +4807,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
public boolean canSaveToDisk() {
return true;
}

4
patches/server/0182-Add-toggle-for-end-portal-safe-teleporting.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Add toggle for end portal safe teleporting
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index f24fb3607c836014a93fcab19ac68253d0cdb8b3..cb3a7b6b02867e88a78437c265ecdc3086b382a5 100644
index 14ddffb3a936945095dbaeade48441cc439ef21f..cf7eb47706b5344fa7619aeda88c9641bda0ad42 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2997,7 +2997,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2998,7 +2998,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
this.processPortalCooldown();

4
patches/server/0214-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 10230658e2c3840af136bd90621992ed04551832..303d1fb7918540ac4324d9d01a6beb70fc37ca5a 100644
index a87fc2fa8399a4f117ef966f482c693747d6b08b..9b2f7d293669f0e9adcb8292e4a27a460321f5a0 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2413,6 +2413,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2414,6 +2414,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.getHandle().getAbilities().walkingSpeed * 2f;
}

4
patches/server/0215-Added-the-ability-to-add-combustible-items.patch
View File

@ -51,10 +51,10 @@ index 4ff472f454b60c3608286b7553926acf74069b73..5cd7b4e7065070bf9fcc34b621dba2cc
private int maxStack = MAX_STACK;
public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index a78bc6977e37c2eaa61b1618a386feab1e4229c3..296b74bf4df1de9b353838f16049f7c2caf61eb2 100644
index 6af3df960800a182f6d4e9cbf4ab5449ce35aaef..3f8f821082ff5d9db35ba096aad6bc0ea8b2c77e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1432,6 +1432,19 @@ public final class CraftServer implements Server {
@@ -1434,6 +1434,19 @@ public final class CraftServer implements Server {
return true;
}

6
patches/server/0270-Add-toggle-for-RNG-manipulation.patch
View File

@ -7,10 +7,10 @@ Paper patches RNG maniplulation by using a shared (and locked) random source.
This comes with a performance gain, but technical players may prefer the ability to manipulate RNG.
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index cb3a7b6b02867e88a78437c265ecdc3086b382a5..3e929ec3fd377b0679ac7070e61378c86d616c92 100644
index cf7eb47706b5344fa7619aeda88c9641bda0ad42..fe0b002a8ebf2f8495bab456854483c341e6a14e 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -579,7 +579,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -580,7 +580,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
this.bb = Entity.INITIAL_AABB;
this.stuckSpeedMultiplier = Vec3.ZERO;
this.nextStep = 1.0F;
@ -33,7 +33,7 @@ index 2a2b56940cd39ca0f14dc8246b41cf6640caa3bd..31c89a6b8f766e1fd03608723c2d03f7
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 523c69b4dfc8c2fb1a6a780f64ee848a8a2d8ead..58d1fb7672650c48be15065f90096a7f9f6763f7 100644
index 2e1da0979b9672a4361dddf97bd8359a30c4d943..7769ceb691f5563843d69463f89c3c49b095a3f4 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -206,9 +206,11 @@ public class PurpurWorldConfig {

28
patches/server/0276-Remove-Mojang-Profiler.patch
View File

@ -768,7 +768,7 @@ index e7e762bbc096c0e87c3d2513d67fec87807b55a4..86b8485c0fb1dc5cd79c9e24546dc744
while (iterator.hasNext()) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index d6edd8501d044980900ac011e1c4938b7fc4e64d..15ec63fab5468bbfbfeefdf5475305fdf64b2b33 100644
index dd21804bb62ad7ae2a086600d9cec7e6ca05f3e8..b425542bfe40f9e621cc5139eafc8266f1c118bf 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1199,7 +1199,7 @@ public class ServerPlayer extends Player {
@ -1027,10 +1027,10 @@ index 2e6e8eac987c4ef6b2dcd3de592d8a51d2b29792..863343a87fe34d72f04af89d75268b47
};
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 3e929ec3fd377b0679ac7070e61378c86d616c92..def4a9fd76b99f4f30fc2f9551cb6b283035cc88 100644
index fe0b002a8ebf2f8495bab456854483c341e6a14e..889db414e3442f51f77be097806e52b4941362d5 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -824,7 +824,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -825,7 +825,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return;
}
// Pufferfish end - entity TTL
@ -1039,7 +1039,7 @@ index 3e929ec3fd377b0679ac7070e61378c86d616c92..def4a9fd76b99f4f30fc2f9551cb6b28
if (firstTick && this instanceof net.minecraft.world.entity.NeutralMob neutralMob) neutralMob.tickInitialPersistentAnger(level); // Paper - Update last hurt when ticking
this.feetBlockState = null;
if (this.isPassenger() && this.getVehicle().isRemoved()) {
@@ -885,7 +885,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -886,7 +886,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
this.firstTick = false;
@ -1048,7 +1048,7 @@ index 3e929ec3fd377b0679ac7070e61378c86d616c92..def4a9fd76b99f4f30fc2f9551cb6b28
}
public void setSharedFlagOnFire(boolean onFire) {
@@ -1059,7 +1059,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1060,7 +1060,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
}
@ -1057,7 +1057,7 @@ index 3e929ec3fd377b0679ac7070e61378c86d616c92..def4a9fd76b99f4f30fc2f9551cb6b28
if (this.stuckSpeedMultiplier.lengthSqr() > 1.0E-7D) {
movement = movement.multiply(this.stuckSpeedMultiplier);
this.stuckSpeedMultiplier = Vec3.ZERO;
@@ -1068,7 +1068,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1069,7 +1069,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
// Paper start - ignore movement changes while inactive.
if (isTemporarilyActive && !(this instanceof ItemEntity || this instanceof net.minecraft.world.entity.vehicle.AbstractMinecart) && movement == getDeltaMovement() && movementType == MoverType.SELF) {
setDeltaMovement(Vec3.ZERO);
@ -1066,7 +1066,7 @@ index 3e929ec3fd377b0679ac7070e61378c86d616c92..def4a9fd76b99f4f30fc2f9551cb6b28
return;
}
// Paper end
@@ -1089,8 +1089,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1090,8 +1090,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
this.setPos(this.getX() + vec3d1.x, this.getY() + vec3d1.y, this.getZ() + vec3d1.z);
}
@ -1077,7 +1077,7 @@ index 3e929ec3fd377b0679ac7070e61378c86d616c92..def4a9fd76b99f4f30fc2f9551cb6b28
boolean flag = !Mth.equal(movement.x, vec3d1.x);
boolean flag1 = !Mth.equal(movement.z, vec3d1.z);
@@ -1109,7 +1109,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1110,7 +1110,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
this.checkFallDamage(vec3d1.y, this.onGround, iblockdata, blockposition);
if (this.isRemoved()) {
@ -1086,7 +1086,7 @@ index 3e929ec3fd377b0679ac7070e61378c86d616c92..def4a9fd76b99f4f30fc2f9551cb6b28
} else {
if (this.horizontalCollision) {
Vec3 vec3d2 = this.getDeltaMovement();
@@ -1250,7 +1250,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1251,7 +1251,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
this.setRemainingFireTicks(-this.getFireImmuneTicks());
}
@ -1095,7 +1095,7 @@ index 3e929ec3fd377b0679ac7070e61378c86d616c92..def4a9fd76b99f4f30fc2f9551cb6b28
}
}
// Paper start - detailed watchdog information
@@ -2964,7 +2964,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2965,7 +2965,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
ServerLevel worldserver1 = minecraftserver.getLevel(resourcekey);
if (true && !this.isPassenger() && this.portalTime++ >= i) { // CraftBukkit
@ -1104,7 +1104,7 @@ index 3e929ec3fd377b0679ac7070e61378c86d616c92..def4a9fd76b99f4f30fc2f9551cb6b28
this.portalTime = i;
// Paper start
io.papermc.paper.event.entity.EntityPortalReadyEvent event = new io.papermc.paper.event.entity.EntityPortalReadyEvent(this.getBukkitEntity(), worldserver1 == null ? null : worldserver1.getWorld(), org.bukkit.PortalType.NETHER);
@@ -2982,7 +2982,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2983,7 +2983,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
} // Paper
// CraftBukkit end
@ -1113,7 +1113,7 @@ index 3e929ec3fd377b0679ac7070e61378c86d616c92..def4a9fd76b99f4f30fc2f9551cb6b28
}
this.isInsidePortal = false;
@@ -3449,14 +3449,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3450,14 +3450,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
// Paper end
if (this.level instanceof ServerLevel && !this.isRemoved()) {
@ -1130,7 +1130,7 @@ index 3e929ec3fd377b0679ac7070e61378c86d616c92..def4a9fd76b99f4f30fc2f9551cb6b28
PortalInfo shapedetectorshape = (location == null) ? this.findDimensionEntryPoint(worldserver) : new PortalInfo(new Vec3(location.x(), location.y(), location.z()), Vec3.ZERO, this.yRot, this.xRot, worldserver, null); // CraftBukkit
if (shapedetectorshape == null) {
@@ -3490,7 +3490,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3491,7 +3491,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
this.unRide();
// CraftBukkit end
@ -1139,7 +1139,7 @@ index 3e929ec3fd377b0679ac7070e61378c86d616c92..def4a9fd76b99f4f30fc2f9551cb6b28
// Paper start - Change lead drop timing to prevent dupe
if (this instanceof Mob) {
((Mob) this).dropLeash(true, true); // Paper drop lead
@@ -3513,10 +3513,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3514,10 +3514,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
this.removeAfterChangingDimensions();

8
patches/server/0279-Debug-Marker-API.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Debug Marker API
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 3e0e497e0072353999165ad04e1e87572132ffc6..50da9d62ef1cdc74a3145e98a5d45885c4926744 100644
index 3f8f821082ff5d9db35ba096aad6bc0ea8b2c77e..e8be00566ae61dd640c194565444c03bd25cd52a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1443,6 +1443,42 @@ public final class CraftServer implements Server {
@@ -1445,6 +1445,42 @@ public final class CraftServer implements Server {
public void removeFuel(org.bukkit.Material material) {
net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity.removeFuel(net.minecraft.world.item.ItemStack.fromBukkitCopy(new ItemStack(material)));
}
@ -99,10 +99,10 @@ index 5fe1151f888c162abc3820617c47519f8119f7c0..39a2ff8c34f995ab860aadc24d24136d
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 9f1cbd4d74b7081ad47a30c109fee5990e70dfcf..bd772d34c621b450fdcf99ac19f00cd57e57629d 100644
index 9b2f7d293669f0e9adcb8292e4a27a460321f5a0..2d74a3c6aeaa10abfbd19a424f3d27427a8d85c5 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3241,5 +3241,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3247,5 +3247,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
}

4
patches/server/0283-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 bd772d34c621b450fdcf99ac19f00cd57e57629d..3c31701795b25b16dafe53292e9561dd0bfbe2b5 100644
index 2d74a3c6aeaa10abfbd19a424f3d27427a8d85c5..e363891e8ab872ed24c557e3f94110f36c6fb277 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3284,5 +3284,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3290,5 +3290,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())));
}

4
patches/server/0292-Language-API.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Language API
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index a4f9b118bb2414ddd6a8985cdc47c37dc43432ea..e5bac6bc792196226f975e7f3dd8f147fb14dbad 100644
index e8be00566ae61dd640c194565444c03bd25cd52a..3f80b16c8d69f284a26b16cf2513a955005bf458 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -317,6 +317,20 @@ public final class CraftServer implements Server {
@@ -319,6 +319,20 @@ public final class CraftServer implements Server {
this.structureManager = new CraftStructureManager(console.getStructureManager());
Bukkit.setServer(this);

10
patches/server/0298-Fire-Immunity-API.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Fire Immunity API
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index def4a9fd76b99f4f30fc2f9551cb6b283035cc88..d18304939e062453cf8ca7d6c1b377930f69174e 100644
index 889db414e3442f51f77be097806e52b4941362d5..3e2e2965270090cb2cf12b6c62cc13d3743e0604 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -400,6 +400,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -401,6 +401,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
private UUID originWorld;
public boolean freezeLocked = false; // Paper - Freeze Tick Lock API
public boolean collidingWithWorldBorder; // Paper
@ -16,7 +16,7 @@ index def4a9fd76b99f4f30fc2f9551cb6b283035cc88..d18304939e062453cf8ca7d6c1b37793
public void setOrigin(@javax.annotation.Nonnull Location location) {
this.origin = location.toVector();
@@ -1677,7 +1678,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1678,7 +1679,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
public boolean fireImmune() {
@ -25,7 +25,7 @@ index def4a9fd76b99f4f30fc2f9551cb6b283035cc88..d18304939e062453cf8ca7d6c1b37793
}
public boolean causeFallDamage(float fallDistance, float damageMultiplier, DamageSource damageSource) {
@@ -2339,6 +2340,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2340,6 +2341,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
nbt.putBoolean("Paper.FreezeLock", true);
}
// Paper end
@ -37,7 +37,7 @@ index def4a9fd76b99f4f30fc2f9551cb6b283035cc88..d18304939e062453cf8ca7d6c1b37793
return nbt;
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
@@ -2507,6 +2513,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2508,6 +2514,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
freezeLocked = nbt.getBoolean("Paper.FreezeLock");
}
// Paper end

4
patches/server/0299-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Add option to teleport to spawn on nether ceiling damage
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index d18304939e062453cf8ca7d6c1b377930f69174e..f31f4ecf8fb07f6cf01eea0aa14f5d454a4ce2a3 100644
index 3e2e2965270090cb2cf12b6c62cc13d3743e0604..e71eca3ddbbeb3168dd73433b6d6ffe9f6755f77 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -899,6 +899,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -900,6 +900,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
&& this.level.paperConfig().environment.netherCeilingVoidDamageHeight.test(v -> this.getY() >= v)
&& (!(this instanceof Player player) || !player.getAbilities().invulnerable))) {
// Paper end