502647092/TabooLib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

紧急修复 NBT 版本兼容漏洞导致物品描述丢失

Browse Source
This commit is contained in:
坏黑 2019-06-25 22:24:48 +08:00
parent 92d43026fa
commit 3eeab6a620
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/scala/me/skymc/taboolib/common/nms/NMSHandlerImpl.java
View File

@ -192,7 +192,7 @@ public class NMSHandlerImpl extends NMSHandler {
} catch (Throwable t) { } catch (Throwable t) {
t.printStackTrace(); t.printStackTrace();
} }
return CraftItemStack.asBukkitCopy((net.minecraft.server.v1_8_R3.ItemStack) nmsItem); return CraftItemStack.asBukkitCopy((net.minecraft.server.v1_8_R3.ItemStack) nmsItem);
} }
@Override @Override
@ -229,7 +229,14 @@ public class NMSHandlerImpl extends NMSHandler {
case 9: case 9:
Object nmsList = new NBTTagList(); Object nmsList = new NBTTagList();
for (me.skymc.taboolib.common.nms.nbt.NBTBase value : base.asList()) { for (me.skymc.taboolib.common.nms.nbt.NBTBase value : base.asList()) {
((List) SimpleReflection.getFieldValue(NBTTagList.class, nmsList, "list")).add(toNBTBase(value)); // 1.14+
if (TabooLib.getVersionNumber() >= 11400) {
((net.minecraft.server.v1_14_R1.NBTTagList) nmsList).add(((net.minecraft.server.v1_14_R1.NBTTagList) nmsList).size(), (net.minecraft.server.v1_14_R1.NBTBase) toNBTBase(value));
}
// 1.13-
else {
((NBTTagList) nmsList).add((NBTBase) toNBTBase(value));
}
} }
return nmsList; return nmsList;
case 10: case 10:

6
src/main/scala/me/skymc/taboolib/inventory/ItemUtils.java
View File

@ -160,7 +160,9 @@ public class ItemUtils {
} }
public static List<String> asString(List<String> args, Player placeholderPlayer) { public static List<String> asString(List<String> args, Player placeholderPlayer) {
IntStream.range(0, args.size()).forEach(i -> args.set(i, asString(args.get(i), placeholderPlayer))); for (int i = 0; i < args.size(); i++) {
args.set(i, asString(args.get(i), placeholderPlayer));
}
return args; return args;
} }
@ -392,7 +394,7 @@ public class ItemUtils {
a.put("Amount", new NBTBase(NumberConversions.toDouble(num.substring(0, num.length() - 1)) / 100D)); a.put("Amount", new NBTBase(NumberConversions.toDouble(num.substring(0, num.length() - 1)) / 100D));
a.put("Operation", new NBTBase(1)); a.put("Operation", new NBTBase(1));
} else { } else {
a.put("Amount", new NBTBase(NumberConversions.toDouble(num) / 100D)); a.put("Amount", new NBTBase(NumberConversions.toDouble(num)));
a.put("Operation", new NBTBase(0)); a.put("Operation", new NBTBase(0));
} }
a.put("AttributeName", new NBTBase(asAttribute(name))); a.put("AttributeName", new NBTBase(asAttribute(name)));