diff --git a/src/main/java/net/raphimc/vialegacy/protocol/classic/c0_30cpetoc0_28_30/Protocolc0_30cpeToc0_28_30.java b/src/main/java/net/raphimc/vialegacy/protocol/classic/c0_30cpetoc0_28_30/Protocolc0_30cpeToc0_28_30.java index 8863551..d647071 100644 --- a/src/main/java/net/raphimc/vialegacy/protocol/classic/c0_30cpetoc0_28_30/Protocolc0_30cpeToc0_28_30.java +++ b/src/main/java/net/raphimc/vialegacy/protocol/classic/c0_30cpetoc0_28_30/Protocolc0_30cpeToc0_28_30.java @@ -105,7 +105,7 @@ public class Protocolc0_30cpeToc0_28_30 extends StatelessProtocol { } default -> { - if (!Via.getConfig().isSuppressConversionWarnings() || Via.getManager().isDebug()) { + if (!Via.getConfig().isSuppressConversionWarnings()) { ViaLegacy.getPlatform().getLogger().warning("1.5.2 EntityDataRewriter: Unhandled Type: " + entityDataIndex.getNewType() + " " + entry); } list.remove(entry); } } } catch (Throwable e) { - if (!Via.getConfig().isSuppressConversionWarnings() || Via.getManager().isDebug()) { + if (!Via.getConfig().isSuppressConversionWarnings()) { ViaLegacy.getPlatform().getLogger().log(Level.WARNING, "Error rewriting entity data entry for " + type.name() + ": " + entry, e); } list.remove(entry); diff --git a/src/main/java/net/raphimc/vialegacy/protocol/release/r1_6_4tor1_7_2_5/Protocolr1_6_4Tor1_7_2_5.java b/src/main/java/net/raphimc/vialegacy/protocol/release/r1_6_4tor1_7_2_5/Protocolr1_6_4Tor1_7_2_5.java index 8ca5596..91ca8ad 100644 --- a/src/main/java/net/raphimc/vialegacy/protocol/release/r1_6_4tor1_7_2_5/Protocolr1_6_4Tor1_7_2_5.java +++ b/src/main/java/net/raphimc/vialegacy/protocol/release/r1_6_4tor1_7_2_5/Protocolr1_6_4Tor1_7_2_5.java @@ -490,7 +490,7 @@ public class Protocolr1_6_4Tor1_7_2_5 extends StatelessTransitionProtocol 16) { - if (!Via.getConfig().isSuppressConversionWarnings() || Via.getManager().isDebug()) { + if (!Via.getConfig().isSuppressConversionWarnings()) { ViaLegacy.getPlatform().getLogger().warning("Ignoring serverbound plugin channel, as it is longer than 16 characters: '" + channel + "'"); } wrapper.cancel(); @@ -1376,7 +1376,7 @@ public class Protocolr1_7_6_10Tor1_8 extends AbstractProtocol validChannels = new ArrayList<>(registeredChannels.length); for (String registeredChannel : registeredChannels) { if (registeredChannel.length() > 16) { - if (!Via.getConfig().isSuppressConversionWarnings() || Via.getManager().isDebug()) { + if (!Via.getConfig().isSuppressConversionWarnings()) { ViaLegacy.getPlatform().getLogger().warning("Ignoring serverbound plugin channel register of '" + registeredChannel + "', as it is longer than 16 characters"); } continue; diff --git a/src/main/java/net/raphimc/vialegacy/protocol/release/r1_7_6_10tor1_8/rewriter/EntityDataRewriter.java b/src/main/java/net/raphimc/vialegacy/protocol/release/r1_7_6_10tor1_8/rewriter/EntityDataRewriter.java index 3638b07..e4f9c98 100644 --- a/src/main/java/net/raphimc/vialegacy/protocol/release/r1_7_6_10tor1_8/rewriter/EntityDataRewriter.java +++ b/src/main/java/net/raphimc/vialegacy/protocol/release/r1_7_6_10tor1_8/rewriter/EntityDataRewriter.java @@ -45,7 +45,7 @@ public class EntityDataRewriter { final EntityDataIndex1_7_6 entityDataIndex = EntityDataIndex1_7_6.searchIndex(type, entry.id()); try { if (entityDataIndex == null) { - if (!Via.getConfig().isSuppressConversionWarnings() || Via.getManager().isDebug()) { + if (!Via.getConfig().isSuppressConversionWarnings()) { ViaLegacy.getPlatform().getLogger().warning("Could not find valid entity data index entry for " + type.name() + ": " + entry); } list.remove(entry); @@ -95,14 +95,14 @@ public class EntityDataRewriter { case STRING, BLOCK_POSITION, ROTATIONS -> { } default -> { - if (!Via.getConfig().isSuppressConversionWarnings() || Via.getManager().isDebug()) { + if (!Via.getConfig().isSuppressConversionWarnings()) { ViaLegacy.getPlatform().getLogger().warning("1.7.10 EntityDataRewriter: Unhandled Type: " + entityDataIndex.getNewType() + " " + entry); } list.remove(entry); } } } catch (Throwable e) { - if (!Via.getConfig().isSuppressConversionWarnings() || Via.getManager().isDebug()) { + if (!Via.getConfig().isSuppressConversionWarnings()) { ViaLegacy.getPlatform().getLogger().log(Level.WARNING, "Error rewriting entity data entry for " + type.name() + ": " + entry, e); } list.remove(entry); diff --git a/src/main/java/net/raphimc/vialegacy/protocol/release/r1_7_6_10tor1_8/rewriter/TextRewriter.java b/src/main/java/net/raphimc/vialegacy/protocol/release/r1_7_6_10tor1_8/rewriter/TextRewriter.java index 29f7d22..9a1bd9b 100644 --- a/src/main/java/net/raphimc/vialegacy/protocol/release/r1_7_6_10tor1_8/rewriter/TextRewriter.java +++ b/src/main/java/net/raphimc/vialegacy/protocol/release/r1_7_6_10tor1_8/rewriter/TextRewriter.java @@ -468,7 +468,7 @@ public class TextRewriter { c.getStyle().setHoverEvent(new TextHoverEvent(textHoverEvent.getAction(), new StringComponent(SNbtSerializer.V1_8.serialize(tag)))); } catch (Throwable e) { - if (!Via.getConfig().isSuppressConversionWarnings() || Via.getManager().isDebug()) { + if (!Via.getConfig().isSuppressConversionWarnings()) { ViaLegacy.getPlatform().getLogger().log(Level.WARNING, "Error remapping NBT in show_item:" + textHoverEvent.getText().asUnformattedString(), e); } c.getStyle().setHoverEvent(new TextHoverEvent(textHoverEvent.getAction(), new StringComponent())); // Invalid item