3
0
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-12-26 16:12:42 +01:00

Merge pull request #857 from PureGero/dev

Skulls don't have 'Rot'; Painting names
Dieser Commit ist enthalten in:
Myles 2018-07-18 18:03:09 +01:00 committet von GitHub
Commit 4e1ab821e1
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 4AEE18F83AFDEB23
2 geänderte Dateien mit 7 neuen und 4 gelöschten Zeilen

Datei anzeigen

@ -28,14 +28,14 @@ public class PaintingProvider implements Provider {
add("bust"); add("bust");
add("stage"); add("stage");
add("void"); add("void");
add("skull_and_roses"); add("skullandroses");
add("wither"); add("wither");
add("fighters"); add("fighters");
add("pointer"); add("pointer");
add("pigscene"); add("pigscene");
add("burning_skull"); add("burningskull");
add("skeleton"); add("skeleton");
add("donkey_kong"); add("donkeykong");
} }
private void add(String motive) { private void add(String motive) {

Datei anzeigen

@ -23,7 +23,10 @@ public class SkullHandler implements BlockEntityProvider.BlockEntityHandler {
int id = storage.get(position).getOriginal(); int id = storage.get(position).getOriginal();
if (id >= SKULL_WALL_START && id <= SKULL_END) { if (id >= SKULL_WALL_START && id <= SKULL_END) {
id += (byte) tag.get("SkullType").getValue() * 20 + (byte) tag.get("Rot").getValue(); id += (byte) tag.get("SkullType").getValue() * 20;
if (tag.contains("Rot")) {
id += (byte) tag.get("Rot").getValue();
}
} else { } else {
System.out.println("Why does this block have the skull block entity? :(" + tag); System.out.println("Why does this block have the skull block entity? :(" + tag);
return -1; return -1;