CPU/Geyser
1
0
Fork 0
forked from GeyserMC/Geyser
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/GeyserMC/Geyser into feature/1.16.2

Browse source
This commit is contained in:
DoctorMacc 2020-07-24 15:45:28 -04:00
commit 127bc39c53
No known key found for this signature in database
GPG key ID: 6D6E7E059F186DB4
2 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
View file

@ -234,9 +234,7 @@ public class GeyserSession implements CommandSender {
upstream.sendPacket(entityPacket); upstream.sendPacket(entityPacket);
CreativeContentPacket creativePacket = new CreativeContentPacket(); CreativeContentPacket creativePacket = new CreativeContentPacket();
for (int i = 0; i < ItemRegistry.CREATIVE_ITEMS.length; i++) { creativePacket.setContents(ItemRegistry.CREATIVE_ITEMS);
creativePacket.getEntries().put(i + 1, ItemRegistry.CREATIVE_ITEMS[i]);
}
upstream.sendPacket(creativePacket); upstream.sendPacket(creativePacket);
PlayStatusPacket playStatusPacket = new PlayStatusPacket(); PlayStatusPacket playStatusPacket = new PlayStatusPacket();

12
connector/src/main/java/org/geysermc/connector/network/translators/item/ItemRegistry.java
View file

@ -163,24 +163,24 @@ public class ItemRegistry {
throw new AssertionError(LanguageUtils.getLocaleStringLog("geyser.toolbox.fail.creative"), e); throw new AssertionError(LanguageUtils.getLocaleStringLog("geyser.toolbox.fail.creative"), e);
} }
int netId = 1;
List<ItemData> creativeItems = new ArrayList<>(); List<ItemData> creativeItems = new ArrayList<>();
for (JsonNode itemNode : creativeItemEntries) { for (JsonNode itemNode : creativeItemEntries) {
try {
short damage = 0; short damage = 0;
NbtMap tag = null;
if (itemNode.has("damage")) { if (itemNode.has("damage")) {
damage = itemNode.get("damage").numberValue().shortValue(); damage = itemNode.get("damage").numberValue().shortValue();
} }
if (itemNode.has("nbt_b64")) { if (itemNode.has("nbt_b64")) {
byte[] bytes = Base64.getDecoder().decode(itemNode.get("nbt_b64").asText()); byte[] bytes = Base64.getDecoder().decode(itemNode.get("nbt_b64").asText());
ByteArrayInputStream bais = new ByteArrayInputStream(bytes); ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
try { tag = (NbtMap) NbtUtils.createReaderLE(bais).readTag();
NbtMap tag = (NbtMap) NbtUtils.createReaderLE(bais).readTag(); }
creativeItems.add(ItemData.of(itemNode.get("id").asInt(), damage, 1, tag)); creativeItems.add(ItemData.fromNet(netId++, itemNode.get("id").asInt(), damage, 1, tag));
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
} else {
creativeItems.add(ItemData.of(itemNode.get("id").asInt(), damage, 1));
}
} }
CREATIVE_ITEMS = creativeItems.toArray(new ItemData[0]); CREATIVE_ITEMS = creativeItems.toArray(new ItemData[0]);
} }