Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-01 16:19:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:mcMMO-Dev/mcMMO into configurable

Browse Source
This commit is contained in:
nossr50 2019-05-06 19:46:58 -07:00
commit 8033bc577c
3 changed files with 646 additions and 372 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog.txt
View File

@ -163,6 +163,9 @@ Version 2.2.0
Added API method to check if player parties are size capped Added API method to check if player parties are size capped
Added API method to grab the level cap of a skill by its PrimarySkillType ENUM definition Added API method to grab the level cap of a skill by its PrimarySkillType ENUM definition
Added API method to check if a skill was being level capped Added API method to check if a skill was being level capped
Version 2.1.56
Very large update to the zh_CN Chinese language file (thanks Dream_m)
Version 2.1.55 Version 2.1.55
Fixed a bug that could occur when adding UUIDs to old outdated DBs Fixed a bug that could occur when adding UUIDs to old outdated DBs

12
src/main/java/com/gmail/nossr50/mcMMO.java
View File

@ -314,24 +314,12 @@ public class mcMMO extends JavaPlugin {
metrics.addCustomChart(new Metrics.SimplePie("scaling", () -> "Standard")); metrics.addCustomChart(new Metrics.SimplePie("scaling", () -> "Standard"));
else else
metrics.addCustomChart(new Metrics.SimplePie("scaling", () -> "Retro")); metrics.addCustomChart(new Metrics.SimplePie("scaling", () -> "Retro"));
//Simplified Server Software Tracking
if (Bukkit.getServer().getVersion().contains("paper"))
metrics.addCustomChart(new Metrics.SimplePie("Server_software", () -> "Paper"));
else if (Bukkit.getServer().getVersion().contains("spigot") && !Bukkit.getServer().getVersion().contains("paper"))
metrics.addCustomChart(new Metrics.SimplePie("Server_software", () -> "Spigot"));
else if (Bukkit.getServer().getVersion().contains("bukkit"))
metrics.addCustomChart(new Metrics.SimplePie("Server_software", () -> "CraftBukkit"));
else
metrics.addCustomChart(new Metrics.SimplePie("Server_software", () -> "Unknown"));
} }
} catch (Throwable t) { } catch (Throwable t) {
getLogger().severe("There was an error while enabling mcMMO!"); getLogger().severe("There was an error while enabling mcMMO!");
t.printStackTrace(); t.printStackTrace();
getLogger().severe("End of error report for mcMMO"); getLogger().severe("End of error report for mcMMO");
getLogger().info("Please do not replace the mcMMO jar while the server is running."); getLogger().info("Please do not replace the mcMMO jar while the server is running.");
//getServer().getPluginManager().disablePlugin(this);
} }
//Init Material Maps //Init Material Maps

1003
src/main/resources/locale/locale_zh_CN.properties
View File

File diff suppressed because it is too large Load Diff