SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests 1 Aktivität

Fix CanDestroy CanPlaceOn on untagged items

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Zach Brown 2019-02-28 19:52:12 -05:00
Ursprung 245e2d1061
Commit ba6cf29d6a
1 geänderte Dateien mit 7 neuen und 9 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

16
Spigot-Server-Patches/Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
Datei anzeigen

@ -32,7 +32,7 @@ index 8e8390282..f52936581 100644
this.s = this::l; this.s = this::l;
if (this.i.canRead() && this.i.peek() == '#') { if (this.i.canRead() && this.i.peek() == '#') {
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
index eaf4cd11c..03644365c 100644 index eaf4cd11c..dc417fb9d 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -0,0 +0,0 @@ import javax.annotation.Nullable; @@ -0,0 +0,0 @@ import javax.annotation.Nullable;
@ -64,8 +64,8 @@ index eaf4cd11c..03644365c 100644
private boolean unbreakable; private boolean unbreakable;
private int damage; private int damage;
+ // Paper start - Implement an API for CanPlaceOn and CanDestroy NBT values + // Paper start - Implement an API for CanPlaceOn and CanDestroy NBT values
+ private Set<Namespaced> placeableKeys; + private Set<Namespaced> placeableKeys = Sets.newHashSet();
+ private Set<Namespaced> destroyableKeys; + private Set<Namespaced> destroyableKeys = Sets.newHashSet();
+ // Paper end + // Paper end
private static final Set<String> HANDLED_TAGS = Sets.newHashSet(); private static final Set<String> HANDLED_TAGS = Sets.newHashSet();
@ -105,7 +105,6 @@ index eaf4cd11c..03644365c 100644
+ } + }
+ +
+ if (tag.hasKey(CAN_PLACE_ON.NBT)) { + if (tag.hasKey(CAN_PLACE_ON.NBT)) {
+ this.placeableKeys = Sets.newHashSet();
+ NBTTagList list = tag.getList(CAN_PLACE_ON.NBT, CraftMagicNumbers.NBT.TAG_STRING); + NBTTagList list = tag.getList(CAN_PLACE_ON.NBT, CraftMagicNumbers.NBT.TAG_STRING);
+ for (int i = 0; i < list.size(); i++) { + for (int i = 0; i < list.size(); i++) {
+ Namespaced namespaced = this.deserializeNamespaced(list.getString(i)); + Namespaced namespaced = this.deserializeNamespaced(list.getString(i));
@ -127,7 +126,6 @@ index eaf4cd11c..03644365c 100644
+ // Paper start - Implement an API for CanPlaceOn and CanDestroy NBT values + // Paper start - Implement an API for CanPlaceOn and CanDestroy NBT values
+ Iterable<?> canPlaceOnSerialized = SerializableMeta.getObject(Iterable.class, map, CAN_PLACE_ON.BUKKIT, true); + Iterable<?> canPlaceOnSerialized = SerializableMeta.getObject(Iterable.class, map, CAN_PLACE_ON.BUKKIT, true);
+ if (canPlaceOnSerialized != null) { + if (canPlaceOnSerialized != null) {
+ this.placeableKeys = Sets.newHashSet();
+ for (Object canPlaceOnElement : canPlaceOnSerialized) { + for (Object canPlaceOnElement : canPlaceOnSerialized) {
+ String canPlaceOnRaw = (String) canPlaceOnElement; + String canPlaceOnRaw = (String) canPlaceOnElement;
+ Namespaced value = this.deserializeNamespaced(canPlaceOnRaw); + Namespaced value = this.deserializeNamespaced(canPlaceOnRaw);
@ -275,7 +273,7 @@ index eaf4cd11c..03644365c 100644
+ @Override + @Override
+ @SuppressWarnings("deprecation") + @SuppressWarnings("deprecation")
+ public Set<Material> getCanDestroy() { + public Set<Material> getCanDestroy() {
+ return this.destroyableKeys == null ? Collections.emptySet() : legacyGetMatsFromKeys(this.destroyableKeys); + return !hasDestroyableKeys() ? Collections.emptySet() : legacyGetMatsFromKeys(this.destroyableKeys);
+ } + }
+ +
+ @Override + @Override
@ -288,7 +286,7 @@ index eaf4cd11c..03644365c 100644
+ @Override + @Override
+ @SuppressWarnings("deprecation") + @SuppressWarnings("deprecation")
+ public Set<Material> getCanPlaceOn() { + public Set<Material> getCanPlaceOn() {
+ return this.placeableKeys == null ? Collections.emptySet() : legacyGetMatsFromKeys(this.placeableKeys); + return !hasPlaceableKeys() ? Collections.emptySet() : legacyGetMatsFromKeys(this.placeableKeys);
+ } + }
+ +
+ @Override + @Override
@ -300,7 +298,7 @@ index eaf4cd11c..03644365c 100644
+ +
+ @Override + @Override
+ public Set<Namespaced> getDestroyableKeys() { + public Set<Namespaced> getDestroyableKeys() {
+ return this.destroyableKeys == null ? Collections.emptySet() : Sets.newHashSet(this.destroyableKeys); + return !hasDestroyableKeys() ? Collections.emptySet() : Sets.newHashSet(this.destroyableKeys);
+ } + }
+ +
+ @Override + @Override
@ -313,7 +311,7 @@ index eaf4cd11c..03644365c 100644
+ +
+ @Override + @Override
+ public Set<Namespaced> getPlaceableKeys() { + public Set<Namespaced> getPlaceableKeys() {
+ return this.placeableKeys == null ? Collections.emptySet() : Sets.newHashSet(this.placeableKeys); + return !hasPlaceableKeys() ? Collections.emptySet() : Sets.newHashSet(this.placeableKeys);
+ } + }
+ +
+ @Override + @Override