Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-04-20 10:18:16 +02: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@ce7f068 Correct typo in javadoc (#9944)
PaperMC/Paper@0a8c873 Call LivingEntity#onItemPickup before mutation (#9948)
PaperMC/Paper@e5274ee Fix spawners checking max nearby entities with correct type (#8945)
PaperMC/Paper@39dee1a More paper config cleanup (#9938)
PaperMC/Paper@581c743 Add API to retrieve an attribute modifier from a UUID (#9924)
PaperMC/Paper@8611796 Fix missing event call for entity teleport API (#9937)
PaperMC/Paper@250388d add getAdvancementProgress() to PlayerAdvancementCriterionGrantEvent (#9865)
This commit is contained in:
granny
2023-11-18 23:40:16 -08:00
parent 2a38801aeb
commit 4b1a082c94
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,7 +34,7 @@ index ef14f47cec00ffaf1ac683964d3d1831dae9bcdb..be7508a527a55ada0f769588db024f99
this.profiler.push(() -> {
return worldserver + " " + worldserver.dimension().location();
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index ee0403e18b484b85c92aca76faf977c013bfdfe0..f7a19cdc38feb0dcee3e3cf42610a0604f9f4672 100644
index 8aab01170fb512d98103935a19e468a145a6bb16..5d20509fd92969ed05f1044290650880fd4a663e 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -223,6 +223,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -5191,10 +5191,10 @@ index 06d1bdb9bd124b201c36d284c50d22bf50d3735a..937f57d8af629c4e913d7ccabf6adab1
public boolean isPickable() {
return false;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 0e6c7284b9aee6c5f2454a3a095ebf349f887740..88e226431bd84747b9fadd68f273432a9efd766e 100644
index 9f843b89dc20b91bf7243facee8486d525e4a1b3..4c5d6e37f7d56436119278bbfad503867d9ccddb 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -1527,4 +1527,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -1538,4 +1538,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return this.getHandle().getScoreboardName();
}
// Paper end - entity scoreboard name