Skip to content

Commit 013c3bb

Browse files
committed
Fix ViaVersion api access
1 parent a109c7a commit 013c3bb

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

bukkit/src/main/java/de/themoep/resourcepacksplugin/bukkit/WorldResourcepacks.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
import org.bukkit.permissions.PermissionDefault;
2525
import org.bukkit.plugin.java.JavaPlugin;
2626
import org.mcstats.MetricsLite;
27-
import us.myles.ViaVersion.api.ViaVersionAPI;
27+
import us.myles.ViaVersion.ViaVersionPlugin;
28+
import us.myles.ViaVersion.api.ViaAPI;
2829

2930
import java.io.IOException;
3031
import java.util.List;
@@ -47,7 +48,7 @@ public class WorldResourcepacks extends JavaPlugin implements ResourcepacksPlugi
4748

4849
private InternalHelper internalHelper;
4950

50-
private ViaVersionAPI viaVersion;
51+
private ViaAPI viaApi;
5152
private NewAPI authmeApi;
5253

5354
public void onEnable() {
@@ -99,9 +100,10 @@ public void onEnable() {
99100
internalHelper = new InternalHelper_fallback();
100101
}
101102

102-
viaVersion = (ViaVersionAPI) getServer().getPluginManager().getPlugin("ViaVersion");
103-
if(viaVersion != null) {
104-
getLogger().log(Level.INFO, "Detected ViaVersion " + viaVersion.getVersion());
103+
ViaVersionPlugin viaPlugin = (ViaVersionPlugin) getServer().getPluginManager().getPlugin("ViaVersion");
104+
if(viaPlugin != null) {
105+
viaApi = viaPlugin.getApi();
106+
getLogger().log(Level.INFO, "Detected ViaVersion " + viaApi.getVersion());
105107
}
106108

107109
if (getConfig().getBoolean("autogeneratehashes", true)) {
@@ -432,8 +434,8 @@ public boolean checkPermission(UUID playerId, String perm) {
432434
public int getPlayerPackFormat(UUID playerId) {
433435
Player player = getServer().getPlayer(playerId);
434436
if(player != null) {
435-
if (viaVersion != null) {
436-
return getPackManager().getPackFormat(viaVersion.getPlayerVersion(playerId));
437+
if (viaApi != null) {
438+
return getPackManager().getPackFormat(viaApi.getPlayerVersion(playerId));
437439
}
438440
return serverPackFormat;
439441
}

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</modules>
2323

2424
<properties>
25-
<plugin.version>1.6.11-SNAPSHOT</plugin.version>
25+
<plugin.version>1.6.12-SNAPSHOT</plugin.version>
2626
</properties>
2727

2828
<repositories>

0 commit comments

Comments
 (0)