Upstream/Minepacks
1
0
Fork 0
mirror of https://github.com/GeorgH93/Minepacks.git synced 2024-11-14 10:45:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add option for better compatibility with BungeeCord setups

Browse Source
This commit is contained in:
GeorgH93 2017-10-19 19:48:08 +02:00
parent 9c4d9ef4ba
commit b0eb919803
5 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>at.pcgamingfreaks</groupId> <groupId>at.pcgamingfreaks</groupId>
<artifactId>MinePacks</artifactId> <artifactId>MinePacks</artifactId>
<version>1.17.4</version> <version>1.17.5-SNAPSHOT</version>
<scm> <scm>
<connection>scm:git:git@github.com:GeorgH93/Bukkit_Minepacks.git</connection> <connection>scm:git:git@github.com:GeorgH93/Bukkit_Minepacks.git</connection>
@ -121,11 +121,11 @@
<distributionManagement> <distributionManagement>
<repository> <repository>
<id>releases</id> <id>releases</id>
<url>http://repo.pcgamingfreaks.at/repository/releases/</url> <url>http://repo.pcgamingfreaks.at/repository/maven-releases/</url>
</repository> </repository>
<snapshotRepository> <snapshotRepository>
<id>snapshots</id> <id>snapshots</id>
<url>http://repo.pcgamingfreaks.at/repository/snapshots/</url> <url>http://repo.pcgamingfreaks.at/repository/maven-snapshots/</url>
</snapshotRepository> </snapshotRepository>
</distributionManagement> </distributionManagement>
</project> </project>

3
resources/config.yml
View File

@ -38,6 +38,9 @@ full_inventory:
# Radius in which items get collected, in meter/blocks, allow decimals # Radius in which items get collected, in meter/blocks, allow decimals
collect_radius: 1.5 collect_radius: 1.5
# Enable this option if you are running a bungeecord setup!
BungeeCordMode: false
# Database settings # Database settings
Database: Database:

9
src/at/pcgamingfreaks/MinePacks/Database/Config.java
View File

@ -28,7 +28,7 @@
public class Config extends Configuration public class Config extends Configuration
{ {
private static final int CONFIG_VERSION = 15; private static final int CONFIG_VERSION = 16;
public Config(JavaPlugin plugin) public Config(JavaPlugin plugin)
{ {
@ -245,6 +245,11 @@ public double getFullInvRadius()
public boolean isV2InfoDisabled() public boolean isV2InfoDisabled()
{ {
return config.getBoolean("Misc.DisableV2Info", false); return config.getBoolean("DisableV2Info", false);
}
public boolean isBungeeCordModeEnabled()
{
return config.getBoolean("BungeeCordMode", false);
} }
} }

7
src/at/pcgamingfreaks/MinePacks/Database/Database.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2014-2016 GeorgH93 * Copyright (C) 2014-2017 GeorgH93
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -29,7 +29,7 @@ public class Database
{ {
protected MinePacks plugin; protected MinePacks plugin;
protected boolean useUUIDs, useUUIDSeparators; protected boolean useUUIDs, useUUIDSeparators, bungeeMode;
protected long maxAge; protected long maxAge;
private HashMap<OfflinePlayer, Backpack> backpacks = new HashMap<>(); private HashMap<OfflinePlayer, Backpack> backpacks = new HashMap<>();
@ -41,6 +41,7 @@ public Database(MinePacks mp)
useUUIDSeparators = plugin.config.getUseUUIDSeparators(); useUUIDSeparators = plugin.config.getUseUUIDSeparators();
useUUIDs = plugin.config.getUseUUIDs(); useUUIDs = plugin.config.getUseUUIDs();
maxAge = plugin.config.getAutoCleanupMaxInactiveDays(); maxAge = plugin.config.getAutoCleanupMaxInactiveDays();
bungeeMode = plugin.config.isBungeeCordModeEnabled();
} }
public static Database getDatabase(MinePacks Plugin) public static Database getDatabase(MinePacks Plugin)
@ -170,7 +171,7 @@ public void close() { }
public void updatePlayerAndLoadBackpack(Player player) public void updatePlayerAndLoadBackpack(Player player)
{ {
updatePlayer(player); updatePlayer(player);
asyncLoadBackpack(player); if(!bungeeMode) asyncLoadBackpack(player);
} }
public void updatePlayer(Player player) {} public void updatePlayer(Player player) {}

11
src/at/pcgamingfreaks/MinePacks/EventListener.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2014-2015 GeorgH93 * Copyright (C) 2014-2017 GeorgH93
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -73,10 +73,7 @@ public void onResult(Backpack backpack)
} }
@Override @Override
public void onFail() public void onFail() {}
{
}
}); });
} }
} }
@ -144,10 +141,10 @@ public void onPlayerLoginEvent(PlayerJoinEvent event)
public void onPlayerLeaveEvent(PlayerQuitEvent event) public void onPlayerLeaveEvent(PlayerQuitEvent event)
{ {
Backpack backpack = plugin.DB.getBackpack(event.getPlayer()); Backpack backpack = plugin.DB.getBackpack(event.getPlayer());
if(backpack != null && !backpack.isOpen()) if(backpack != null)
{ {
backpack.save(); backpack.save();
plugin.DB.unloadBackpack(backpack); if(!backpack.isOpen()) plugin.DB.unloadBackpack(backpack);
} }
if(plugin.cooldowns.containsKey(event.getPlayer())) if(plugin.cooldowns.containsKey(event.getPlayer()))
{ {