TotalFreedomMC/VulnerabilityPatcher
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/VulnerabilityPatcher.git synced 2025-02-05 06:12:46 +00:00
Code Issues Projects Releases Wiki Activity

Fixed where new signs would throw NPE

Browse source
This commit is contained in:
Nathan Curran 2021-06-16 22:48:00 +10:00
parent 03393f0c34
commit bd4c2bb449
No known key found for this signature in database
GPG key ID: B3A964B30C2E56B8
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/main/java/me/cooljwb/vulnerabilitypatcher/modifiers/NBTModifier_1_16_3.java
View file

@ -507,12 +507,16 @@ public class NBTModifier_1_16_3
if (item != null && item.getType().name().contains("SIGN")) if (item != null && item.getType().name().contains("SIGN"))
{ {
net.minecraft.server.v1_16_R3.ItemStack nmsItem = CraftItemStack.asNMSCopy(item); net.minecraft.server.v1_16_R3.ItemStack nmsItem = CraftItemStack.asNMSCopy(item);
NBTTagCompound tag = nmsItem.getTag().getCompound("BlockEntityTag"); NBTTagCompound tag = nmsItem.getTag();
String text1 = tag.getString("Text1").toLowerCase(); if (tag != null)
String text2 = tag.getString("Text2").toLowerCase(); {
String text3 = tag.getString("Text3").toLowerCase(); NBTTagCompound blockEntityTag = tag.getCompound("BlockEntityTag");
String text4 = tag.getString("Text4").toLowerCase(); String text1 = blockEntityTag.hasKey("Text1") ? tag.getString("Text1").toLowerCase() : "";
return text1.contains("\"nbt\":") || text2.contains("\"nbt\":") || text3.contains("\"nbt\":") || text4.contains("\"nbt\":"); String text2 = blockEntityTag.hasKey("Text2") ? tag.getString("Text2").toLowerCase() : "";
String text3 = blockEntityTag.hasKey("Text3") ? tag.getString("Text3").toLowerCase() : "";
String text4 = blockEntityTag.hasKey("Text4") ? tag.getString("Text4").toLowerCase() : "";
return text1.contains("\"nbt\":") || text2.contains("\"nbt\":") || text3.contains("\"nbt\":") || text4.contains("\"nbt\":");
}
} }
return false; return false;
} }
@ -522,10 +526,10 @@ public class NBTModifier_1_16_3
ItemStack item = event.getItemInHand(); ItemStack item = event.getItemInHand();
net.minecraft.server.v1_16_R3.ItemStack nmsItem = CraftItemStack.asNMSCopy(item); net.minecraft.server.v1_16_R3.ItemStack nmsItem = CraftItemStack.asNMSCopy(item);
NBTTagCompound tag = nmsItem.getTag().getCompound("BlockEntityTag"); NBTTagCompound tag = nmsItem.getTag().getCompound("BlockEntityTag");
String text1 = tag.getString("Text1").toLowerCase(); String text1 = tag.hasKey("Text1") ? tag.getString("Text1").toLowerCase() : "";
String text2 = tag.getString("Text2").toLowerCase(); String text2 = tag.hasKey("Text2") ? tag.getString("Text2").toLowerCase() : "";
String text3 = tag.getString("Text3").toLowerCase(); String text3 = tag.hasKey("Text3") ? tag.getString("Text3").toLowerCase() : "";
String text4 = tag.getString("Text4").toLowerCase(); String text4 = tag.hasKey("Text4") ? tag.getString("Text4").toLowerCase() : "";
if (text1.contains("\"nbt\":")) if (text1.contains("\"nbt\":"))
{ {
tag.setString("Text1", "{\"text\":\"NBT tag removed\"}"); tag.setString("Text1", "{\"text\":\"NBT tag removed\"}");