Skip to content

Commit 339ae55

Browse files
committed
add warning if user using real display item
1 parent aaa53e1 commit 339ae55

File tree

1 file changed

+23
-21
lines changed

1 file changed

+23
-21
lines changed

src/main/java/org/maxgamer/quickshop/QuickShop.java

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ public class QuickShop extends JavaPlugin {
262262
@Getter
263263
private WorldEditAdapter worldEditAdapter;
264264
@Getter
265-
private TextManager textManager ;
265+
private TextManager textManager;
266266

267267
/**
268268
* Use for mock bukkit
@@ -374,7 +374,7 @@ private void load3rdParty() {
374374
}
375375
}
376376
}
377-
Bukkit.getPluginManager().registerEvents(this.compatibilityTool,this);
377+
Bukkit.getPluginManager().registerEvents(this.compatibilityTool, this);
378378
compatibilityTool.searchAndRegisterPlugins();
379379
if (this.display) {
380380
//VirtualItem support
@@ -389,24 +389,26 @@ private void load3rdParty() {
389389
saveConfig();
390390
}
391391
}
392-
393-
if (DisplayItem.getNowUsing() == DisplayType.REALITEM && Bukkit.getPluginManager().getPlugin("ClearLag") != null) {
394-
try {
395-
Clearlag clearlag = (Clearlag) Bukkit.getPluginManager().getPlugin("ClearLag");
396-
for (RegisteredListener clearLagListener : ItemSpawnEvent.getHandlerList().getRegisteredListeners()) {
397-
if (!clearLagListener.getPlugin().equals(clearlag)) {
398-
continue;
399-
}
400-
if (clearLagListener.getListener().getClass().equals(ItemMergeListener.class)) {
401-
ItemSpawnEvent.getHandlerList().unregister(clearLagListener.getListener());
402-
getLogger().warning("+++++++++++++++++++++++++++++++++++++++++++");
403-
getLogger().severe("Detected incompatible module of ClearLag-ItemMerge module, it will broken the QuickShop display, we already unregister this module listener!");
404-
getLogger().severe("Please turn off it in the ClearLag config.yml or turn off the QuickShop display feature!");
405-
getLogger().severe("If you didn't do that, this message will keep spam in your console every times you server boot up!");
406-
getLogger().warning("+++++++++++++++++++++++++++++++++++++++++++");
392+
if (DisplayItem.getNowUsing() == DisplayType.REALITEM) {
393+
getLogger().warning("You're using Real Display system and that may cause your server lagg, switch to Virtual Display system if you can!");
394+
if (Bukkit.getPluginManager().getPlugin("ClearLag") != null) {
395+
try {
396+
Clearlag clearlag = (Clearlag) Bukkit.getPluginManager().getPlugin("ClearLag");
397+
for (RegisteredListener clearLagListener : ItemSpawnEvent.getHandlerList().getRegisteredListeners()) {
398+
if (!clearLagListener.getPlugin().equals(clearlag)) {
399+
continue;
400+
}
401+
if (clearLagListener.getListener().getClass().equals(ItemMergeListener.class)) {
402+
ItemSpawnEvent.getHandlerList().unregister(clearLagListener.getListener());
403+
getLogger().warning("+++++++++++++++++++++++++++++++++++++++++++");
404+
getLogger().severe("Detected incompatible module of ClearLag-ItemMerge module, it will broken the QuickShop display, we already unregister this module listener!");
405+
getLogger().severe("Please turn off it in the ClearLag config.yml or turn off the QuickShop display feature!");
406+
getLogger().severe("If you didn't do that, this message will keep spam in your console every times you server boot up!");
407+
getLogger().warning("+++++++++++++++++++++++++++++++++++++++++++");
408+
}
407409
}
410+
} catch (Exception ignored) {
408411
}
409-
} catch (Exception ignored) {
410412
}
411413
}
412414
}
@@ -804,7 +806,7 @@ public final void onEnable() {
804806
MsgUtil.loadItemi18n();
805807
MsgUtil.loadEnchi18n();
806808
MsgUtil.loadPotioni18n();
807-
// shopControlPanelManager = new ShopControlPanel(this);
809+
// shopControlPanelManager = new ShopControlPanel(this);
808810
// this.previewProtectionLore = MsgUtil.getMessageOfflinePlayer("quickshop-gui-preview", null);
809811
// if (this.previewProtectionLore == null || this.previewProtectionLore.isEmpty()) {
810812
// this.previewProtectionLore = ChatColor.RED + "FIXME: DON'T SET THIS TO EMPTY STRING";
@@ -1899,7 +1901,7 @@ private void updateConfig(int selectedVersion) throws IOException {
18991901
}
19001902
if (selectedVersion == 141) {
19011903
getConfig().set("language", null);
1902-
getConfig().set("disabled-languages",Collections.singletonList("disable_here"));
1904+
getConfig().set("disabled-languages", Collections.singletonList("disable_here"));
19031905
getConfig().set("config-version", ++selectedVersion);
19041906
}
19051907

@@ -1956,7 +1958,7 @@ public void registerCustomCommands() {
19561958
Util.debugLog("Command alias successfully registered.");
19571959
}
19581960

1959-
public @NotNull TextManager text(){
1961+
public @NotNull TextManager text() {
19601962
return textManager;
19611963
}
19621964
}

0 commit comments

Comments
 (0)