mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-04-18 06:10:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

set up dependency stuff

Browse Source
This commit is contained in:
dfsek
2021-02-20 22:31:13 -07:00
parent 76f2a3fbc4
commit 45dbe45fb4
9 changed files with 144 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java
View File

@@ -141,7 +141,12 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
LangUtil.load(config.getLanguage(), this); // Load language.
debugLogger.setDebug(isDebug());
addonRegistry.loadAll();
if(!addonRegistry.loadAll()) {
getLogger().severe("Failed to load addons. Please correct addon installations to continue.");
Bukkit.getPluginManager().disablePlugin(this);
return;
}
registry.loadAll(this); // Load all config packs.
PluginCommand c = Objects.requireNonNull(getCommand("terra"));

2
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/SerializationUtil.java
View File

@@ -41,7 +41,7 @@ public final class SerializationUtil {
try {
if(result.getName().contains(oldNameSpace)) {
String newClassName = result.getName().replace(oldNameSpace, newNameSpace);
Class localClass = Class.forName(newClassName);
Class<?> localClass = Class.forName(newClassName);
Field nameField = ObjectStreamClass.class.getDeclaredField("name");
nameField.setAccessible(true);