Skip to content

Improve old spawn egg legacy conversion #13532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MartijnMuijsers wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Improve old spawn egg legacy conversion #13532

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 11 additions & 14 deletions paper-server/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,10 @@ public static void init() {
if (!material.isLegacy()) {
continue;
}
// Do old spawn eggs separately
if (material == Material.LEGACY_MONSTER_EGG) {
continue;
}

// Handle blocks
if (isBlock(material)) { // Use custom method instead of Material#isBlock since it relies on this being already run
Expand Down Expand Up @@ -382,16 +386,8 @@ public static void init() {

// Handle items (and second fallback for blocks)
int maxData = material.getMaxDurability() == 0 ? 16 : 1;
// Manually do oldold spawn eggs
if (material == Material.LEGACY_MONSTER_EGG) {
maxData = 121; // Vilager + 1
}

for (byte data = 0; data < maxData; data++) {
// Manually skip invalid oldold spawn
if (material == Material.LEGACY_MONSTER_EGG /*&& data != 0 && EntityType.fromId(data) == null*/) { // Mojang broke 18w19b
continue;
}
// Skip non item stacks for now (18w19b)
if (ItemIdFix.getItem(material.getId()) == null) {
continue;
Expand Down Expand Up @@ -423,14 +419,15 @@ public static void init() {
itemToMaterial.put(newMaterial, matData);
}
}
}

for (Map.Entry<Byte, Material> entry : SPAWN_EGGS.entrySet()) {
MaterialData matData = new MaterialData(Material.LEGACY_MONSTER_EGG, entry.getKey());
Item newMaterial = CraftMagicNumbers.getItem(entry.getValue());
// Do old spawn eggs
for (Map.Entry<Byte, Material> entry : SPAWN_EGGS.entrySet()) {
MaterialData matData = new MaterialData(Material.LEGACY_MONSTER_EGG, entry.getKey());
Item newMaterial = CraftMagicNumbers.getItem(entry.getValue());

materialToItem.put(matData, newMaterial);
itemToMaterial.put(newMaterial, matData);
}
materialToItem.put(matData, newMaterial);
itemToMaterial.put(newMaterial, matData);
}
}

Expand Down
Loading