Skip to content
This repository was archived by the owner on Jul 7, 2023. It is now read-only.

Commit 8b90eb9

Browse files
committed
Move multiversion materials setup to before Conf setup
1 parent 124cd4f commit 8b90eb9

File tree

1 file changed

+18
-13
lines changed
  • src/main/java/com/massivecraft/factions

1 file changed

+18
-13
lines changed

src/main/java/com/massivecraft/factions/P.java

+18-13
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,28 @@ public void playSound(Player p, String sound) {
109109

110110
@Override
111111
public void onEnable() {
112+
log("==== Setup ====");
113+
int version = Integer.parseInt(ReflectionUtils.PackageType.getServerVersion().split("_")[1]);
114+
if (version == 7) {
115+
P.p.log("Minecraft Version 1.7 found, disabling banners, itemflags inside GUIs, and Titles.");
116+
mc17 = true;
117+
} else if (version == 8) {
118+
P.p.log("Minecraft Version 1.8 found, Title Fadeouttime etc will not be configurable.");
119+
mc18 = true;
120+
} else if (version == 13) {
121+
P.p.log("Minecraft Version 1.13 found, New Items will be used.");
122+
mc113 = true;
123+
changeItemIDSInConfig();
124+
}
125+
setupMultiversionMaterials();
126+
log("==== End Setup ====");
127+
112128
if (!preEnable()) {
113129
return;
114130
}
115131
this.loadSuccessful = false;
116132
saveDefaultConfig();
117-
setupMultiversionMaterials();
133+
118134
// Load Conf from disk
119135
Conf.load();
120136
Essentials.setup();
@@ -157,18 +173,7 @@ public void onEnable() {
157173
MassiveStats massive = new MassiveStats(this);
158174

159175

160-
int version = Integer.parseInt(ReflectionUtils.PackageType.getServerVersion().split("_")[1]);
161-
if (version == 7) {
162-
P.p.log("Minecraft Version 1.7 found, disabling banners, itemflags inside GUIs, and Titles.");
163-
mc17 = true;
164-
} else if (version == 8) {
165-
P.p.log("Minecraft Version 1.8 found, Title Fadeouttime etc will not be configurable.");
166-
mc18 = true;
167-
} else if (version == 13) {
168-
P.p.log("Minecraft Version 1.13 found, New Items will be used.");
169-
mc113 = true;
170-
changeItemIDSInConfig();
171-
}
176+
172177

173178
if (version > 8) {
174179
useNonPacketParticles = true;

0 commit comments

Comments
 (0)