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@ae5e78a4 [ci/skip] Clarify the functionality of AbstractVillager#resetOffers (#13260)
PaperMC/Paper@ea9cd17c Use version fetcher from unsafe values in new version command (#13246)
PaperMC/Paper@c68a55ca Optimise CraftWorld#spawnParticle (#13250)
PaperMC/Paper@6794db4f Make spawning more accurately track vanilla (#12627)
PaperMC/Paper@f55a34fd Properly handle provider plugins in load order (#13242)
PaperMC/Paper@e74d7023 Fix HelpMap topic creation for bootstrap commands (#13231)
PaperMC/Paper@fcb2956a Add debug logging for entities with invalid ids (#13229)
PaperMC/Paper@5fd3c951 Add Entity#teleportAsync(Location, TeleportFlag...) (#13208)
PaperMC/Paper@e8c6ba50 Expose JukeboxSong variables (#13214)
This commit is contained in:
granny
2025-11-02 13:10:19 -08:00
parent 626a3cb232
commit fc89fde56b
7 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
purpur-server/minecraft-patches/sources/net/minecraft/world/entity/EntityType.java.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/EntityType.java
+++ b/net/minecraft/world/entity/EntityType.java
@@ -1213,6 +_,16 @@
@@ -1214,6 +_,16 @@
return register(vanillaEntityId(key), builder);
}
@@ -17,7 +17,7 @@
public static ResourceLocation getKey(EntityType<?> entityType) {
return BuiltInRegistries.ENTITY_TYPE.getKey(entityType);
}
@@ -1444,6 +_,16 @@
@@ -1445,6 +_,16 @@
return this.category;
}
@@ -34,16 +34,11 @@
public String getDescriptionId() {
return this.descriptionId;
}
@@ -1503,7 +_,11 @@
entity.load(input);
},
// Paper end - Don't fire sync event during generation
- () -> LOGGER.warn("Skipping Entity with id {}", input.getStringOr("id", "[invalid]"))
+ // Purpur start - log skipped entity's position
+ () -> {LOGGER.warn("Skipping Entity with id {}", input.getStringOr("id", "[invalid]"));
+ EntityType.LOGGER.warn("Location: {} {}", level.getWorld().getName(), input.read("Pos", net.minecraft.world.phys.Vec3.CODEC).orElse(net.minecraft.world.phys.Vec3.ZERO));
+ }
+ // Purpur end - log skipped entity's position
);
}
@@ -1507,6 +_,7 @@
// Paper start - Add logging for debugging entity tags with invalid ids
() -> {
LOGGER.warn("Skipping Entity with id {}", input.getStringOr("id", "[invalid]"));
+ LOGGER.warn("Location: {} {}", level.getWorld().getName(), input.read("Pos", net.minecraft.world.phys.Vec3.CODEC).orElse(net.minecraft.world.phys.Vec3.ZERO)); // Purpur - log skipped entity's position
if ((DEBUG_ENTITIES_WITH_INVALID_IDS || level.getCraftServer().getServer().isDebugging()) && input instanceof TagValueInput tagInput) {
LOGGER.warn("Skipped entity tag: {}", tagInput.input);
}