3
0
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-11-03 14:50:30 +01:00

Merge pull request #816 from creeper123123321/dev

Fix last pull request
Dieser Commit ist enthalten in:
Mats 2018-03-20 18:52:14 +01:00 committet von GitHub
Commit 5801cd1e0f
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 4AEE18F83AFDEB23

Datei anzeigen

@ -198,13 +198,14 @@ public class InventoryPackets {
public static void toClient(Item item) {
if (item == null) return;
int rawId = (item.getId() << 16 | item.getData() & 0xFFFF);
int originalId = rawId;
int rawId = (item.getId() << 4 | item.getData() & 0xF);
int originalId = (item.getId() << 16 | item.getData() & 0xFFFF);
// Save original id
CompoundTag tag = item.getTag();
if (tag == null) {
item.setTag(tag = new CompoundTag("tag"));
}
item.getTag().put(new IntTag(NBT_TAG_NAME, originalId));
if (!MappingData.oldToNewItems.containsKey(rawId)) {
if (MappingData.oldToNewItems.containsKey(item.getId() << 4)) {
rawId = item.getId() << 4;
@ -231,7 +232,6 @@ public class InventoryPackets {
// todo spawn egg
item.setId(MappingData.oldToNewItems.get(rawId).shortValue());
item.setData((short) 0);
item.getTag().put(new IntTag(NBT_TAG_NAME, originalId));
}
public static void toServer(Item item) {