Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-09-29 15:07:29 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #816 from creeper123123321/dev

Browse Source 
Fix last pull request
This commit is contained in:
Mats 2018-03-20 18:52:14 +01:00 committed by GitHub
commit 5801cd1e0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/packets/InventoryPackets.java
View File

@ -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) {