Upstream/CoreProtect
1
0
Fork 0
mirror of https://github.com/PlayPro/CoreProtect.git synced 2024-11-28 12:55:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed IllegalArgumentException when processing corrupt data

Browse Source
This commit is contained in:
Intelli 2022-03-24 17:11:37 -06:00
parent 1974838f74
commit 070c5139e1
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/coreprotect/database/Rollback.java
View File

@ -1914,7 +1914,7 @@ public class Rollback extends Queue {
}
itemstack.setItemMeta(meta);
}
else if ((rowType == Material.MAP)) {
else if (rowType == Material.MAP || rowType == Material.FILLED_MAP) {
for (Map<String, Object> colorData : map) {
MapMeta meta = (MapMeta) itemstack.getItemMeta();
org.bukkit.Color color = org.bukkit.Color.deserialize(colorData);

18
src/main/java/net/coreprotect/utility/Util.java
View File

@ -1386,12 +1386,16 @@ public class Util extends Queue {
}
public static BlockData createBlockData(Material material) {
BlockData result = material.createBlockData();
if (result instanceof Waterlogged) {
((Waterlogged) result).setWaterlogged(false);
try {
BlockData result = material.createBlockData();
if (result instanceof Waterlogged) {
((Waterlogged) result).setWaterlogged(false);
}
return result;
}
catch (Exception e) {
return null;
}
return result;
}
public static void prepareTypeAndData(Map<Block, BlockData> map, Block block, Material type, BlockData blockData, boolean update) {
@ -1413,7 +1417,9 @@ public class Util extends Queue {
blockData = createBlockData(type);
}
block.setBlockData(blockData, update);
if (blockData != null) {
block.setBlockData(blockData, update);
}
}
public static boolean successfulQuery(Connection connection, String query) {