TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-11 11:49:12 +00:00
Code Issues Projects Releases Wiki Activity

Fix banner/shield deserializer with PatternType.

Browse source
This commit is contained in:
Ali Moghnieh 2016-07-26 22:03:33 +01:00
parent 743ac51c4c
commit 5960f55339
No known key found for this signature in database
GPG key ID: F09D3A1BAF2E6D70
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Essentials/src/com/earth2me/essentials/MetaItemStack.java
View file

@ -449,12 +449,17 @@ public class MetaItemStack {
if (split.length < 2) { if (split.length < 2) {
throw new Exception(tl("invalidBanner", split[1])); throw new Exception(tl("invalidBanner", split[1]));
} }
PatternType patternType = null;
try {
patternType = PatternType.valueOf(split[0]);
} catch (Exception ignored ) {}
final BannerMeta meta = (BannerMeta) stack.getItemMeta(); final BannerMeta meta = (BannerMeta) stack.getItemMeta();
if (split[0].equalsIgnoreCase("basecolor")) { if (split[0].equalsIgnoreCase("basecolor")) {
Color color = Color.fromRGB(Integer.valueOf(split[1])); Color color = Color.fromRGB(Integer.valueOf(split[1]));
meta.setBaseColor(DyeColor.getByColor(color)); meta.setBaseColor(DyeColor.getByColor(color));
} else if (PatternType.valueOf(split[0]) != null) { } else if (patternType != null) {
PatternType type = PatternType.valueOf(split[0]); PatternType type = PatternType.valueOf(split[0]);
DyeColor color = DyeColor.getByColor(Color.fromRGB(Integer.valueOf(split[1]))); DyeColor color = DyeColor.getByColor(Color.fromRGB(Integer.valueOf(split[1])));
org.bukkit.block.banner.Pattern pattern = new org.bukkit.block.banner.Pattern(color, type); org.bukkit.block.banner.Pattern pattern = new org.bukkit.block.banner.Pattern(color, type);
@ -469,13 +474,18 @@ public class MetaItemStack {
throw new Exception(tl("invalidBanner", split[1])); throw new Exception(tl("invalidBanner", split[1]));
} }
PatternType patternType = null;
try {
patternType = PatternType.valueOf(split[0]);
} catch (Exception ignored ) {}
// Hacky fix for accessing Shield meta - https://github.com/drtshock/Essentials/pull/745#issuecomment-234843795 // Hacky fix for accessing Shield meta - https://github.com/drtshock/Essentials/pull/745#issuecomment-234843795
BlockStateMeta meta = (BlockStateMeta) stack.getItemMeta(); BlockStateMeta meta = (BlockStateMeta) stack.getItemMeta();
Banner banner = (Banner) meta.getBlockState(); Banner banner = (Banner) meta.getBlockState();
if (split[0].equalsIgnoreCase("basecolor")) { if (split[0].equalsIgnoreCase("basecolor")) {
Color color = Color.fromRGB(Integer.valueOf(split[1])); Color color = Color.fromRGB(Integer.valueOf(split[1]));
banner.setBaseColor(DyeColor.getByColor(color)); banner.setBaseColor(DyeColor.getByColor(color));
} else if (PatternType.valueOf(split[0]) != null) { } else if (patternType != null) {
PatternType type = PatternType.valueOf(split[0]); PatternType type = PatternType.valueOf(split[0]);
DyeColor color = DyeColor.getByColor(Color.fromRGB(Integer.valueOf(split[1]))); DyeColor color = DyeColor.getByColor(Color.fromRGB(Integer.valueOf(split[1])));
org.bukkit.block.banner.Pattern pattern = new org.bukkit.block.banner.Pattern(color, type); org.bukkit.block.banner.Pattern pattern = new org.bukkit.block.banner.Pattern(color, type);