mirror/Plan
2
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-12-15 05:41:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Merge] Version 4.6.1 (#892)

Browse Source
This commit is contained in:
Risto Lahtela 2019-01-19 13:22:30 +02:00 committed by GitHub
commit 7bd148d97e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Plan/build.gradle
View File

@ -12,7 +12,7 @@ allprojects {
wrapper.gradleVersion = "5.0"
group "com.djrapitops"
version "4.6.0-SNAPSHOT"
version "4.6.1-SNAPSHOT"
test {
testLogging {
@ -42,11 +42,11 @@ subprojects {
sourceCompatibility = 1.8
targetCompatibility = 1.8
ext.daggerVersion = "2.20"
ext.daggerCompilerVersion = "2.20"
ext.daggerVersion = "2.21"
ext.daggerCompilerVersion = "2.21"
ext.abstractPluginFrameworkVersion = "3.4.1"
ext.planPluginBridgeVersion = "4.6.0-1"
ext.planPluginBridgeVersion = "4.6.1"
ext.bukkitVersion = "1.12.2-R0.1-SNAPSHOT"
ext.spigotVersion = "1.12.2-R0.1-SNAPSHOT"

4
Plan/bungeecord/src/main/java/com/djrapitops/plan/system/listeners/bungee/PlayerOnlineListener.java
View File

@ -78,7 +78,7 @@ public class PlayerOnlineListener implements Listener {
InetAddress address = player.getAddress().getAddress();
long time = System.currentTimeMillis();
sessionCache.cacheSession(uuid, new Session(uuid, serverInfo.getServerUUID(), time, "", ""));
sessionCache.cacheSession(uuid, new Session(uuid, serverInfo.getServerUUID(), time, null, null));
boolean gatheringGeolocations = config.isTrue(DataGatheringSettings.GEOLOCATIONS);
@ -114,7 +114,7 @@ public class PlayerOnlineListener implements Listener {
long time = System.currentTimeMillis();
// Replaces the current session in the cache.
sessionCache.cacheSession(uuid, new Session(uuid, serverInfo.getServerUUID(), time, "", ""));
sessionCache.cacheSession(uuid, new Session(uuid, serverInfo.getServerUUID(), time, null, null));
processing.submit(processors.info().playerPageUpdateProcessor(uuid));
} catch (Exception e) {
errorHandler.log(L.WARN, this.getClass(), e);

1
Plan/common/src/main/java/com/djrapitops/plan/data/time/WorldTimes.java
View File

@ -55,6 +55,7 @@ public class WorldTimes {
}
private void addWorld(String worldName, String gameMode, long changeTime) {
if (worldName == null || gameMode == null) return;
times.put(worldName, new GMTimes(gameMode, changeTime));
}

4
Plan/common/src/main/java/com/djrapitops/plan/system/settings/config/WorldAliasSettings.java
View File

@ -85,6 +85,8 @@ public class WorldAliasSettings {
* @param world World name
*/
public void addWorld(String world) {
Verify.isFalse(Verify.isEmpty(world), () -> new IllegalArgumentException("Attempted to save a world alias '" + world + "'"));
ConfigNode aliasSect = getAliasSection();
String previousValue = aliasSect.getString(world);
@ -165,7 +167,7 @@ public class WorldAliasSettings {
}
WorldTimes worldTimes = session.getUnsafe(SessionKeys.WORLD_TIMES);
if (!session.supports(SessionKeys.END)) {
return "Current: " + aliases.get(worldTimes.getCurrentWorld());
return "Current: " + aliases.getOrDefault(worldTimes.getCurrentWorld(), "Unknown");
}
Map<String, Long> playtimePerAlias = getPlaytimePerAlias(worldTimes);

2
Plan/common/src/main/resources/bungee.yml
View File

@ -1,7 +1,7 @@
name: Plan
author: Rsl1122
main: com.djrapitops.plan.PlanBungee
version: 4.6.0
version: 4.6.1
softdepend:
- AdvancedBan
- LiteBans

6
Plan/common/src/main/resources/bungeeconfig.yml
View File

@ -103,6 +103,7 @@ Display_options:
# Colors will be determined alphabetically in any case.
Order_world_pies_by_percentage: false
Players_table:
Show_on_server_page: 2500
Show_on_players_page: 25000
Open_player_links_in_new_tab: false
Show_player_IPs: true
@ -138,6 +139,11 @@ Formatting:
NoSeconds: 'MMM d YYYY, HH:mm'
JustClock: 'HH:mm:ss'
# -----------------------------------------------------
# World aliases can be used to rename worlds and to combine multiple worlds into a group.
# -----------------------------------------------------
World_aliases:
world: world
# -----------------------------------------------------
# These settings will make Plan write .js, .css, .json and .html files to some location on disk.
# Relative path will render to /plugins/Plan/path
# Make sure user running the server has write permissions to the path.

2
Plan/common/src/main/resources/plugin.yml
View File

@ -1,7 +1,7 @@
name: Plan
author: Rsl1122
main: com.djrapitops.plan.Plan
version: 4.6.0
version: 4.6.1
softdepend:
- EssentialsX
- Towny

1
Plan/common/src/test/java/com/djrapitops/plan/system/settings/ConfigSettingKeyTest.java
View File

@ -103,7 +103,6 @@ public class ConfigSettingKeyTest {
settings.remove(PluginSettings.SERVER_NAME);
settings.remove(PluginSettings.BUNGEE_COPY_CONFIG);
settings.remove(DatabaseSettings.TYPE);
settings.remove(DisplaySettings.PLAYERS_PER_SERVER_PAGE);
settings.remove(DisplaySettings.GRAPH_TPS_THRESHOLD_MED);
settings.remove(DisplaySettings.GRAPH_TPS_THRESHOLD_HIGH);
settings.remove(DisplaySettings.GRAPH_DISK_THRESHOLD_MED);

2
Plan/sponge/src/main/java/com/djrapitops/plan/PlanSponge.java
View File

@ -42,7 +42,7 @@ import java.io.InputStream;
@Plugin(
id = "plan",
name = "Plan",
version = "4.6.0",
version = "4.6.1",
description = "Player Analytics Plugin by Rsl1122",
authors = {"Rsl1122"},
dependencies = {

2
Plan/velocity/src/main/java/com/djrapitops/plan/PlanVelocity.java
View File

@ -46,7 +46,7 @@ import java.nio.file.Path;
@Plugin(
id = "plan",
name = "Plan",
version = "4.6.0",
version = "4.6.1",
description = "Player Analytics Plugin by Rsl1122",
authors = {"Rsl1122"}
)

4
Plan/velocity/src/main/java/com/djrapitops/plan/system/listeners/velocity/PlayerOnlineListener.java
View File

@ -81,7 +81,7 @@ public class PlayerOnlineListener {
InetAddress address = player.getRemoteAddress().getAddress();
long time = System.currentTimeMillis();
sessionCache.cacheSession(uuid, new Session(uuid, serverInfo.getServerUUID(), time, "", ""));
sessionCache.cacheSession(uuid, new Session(uuid, serverInfo.getServerUUID(), time, null, null));
boolean gatheringGeolocations = config.isTrue(DataGatheringSettings.GEOLOCATIONS);
@ -117,7 +117,7 @@ public class PlayerOnlineListener {
long now = System.currentTimeMillis();
// Replaces the current session in the cache.
sessionCache.cacheSession(uuid, new Session(uuid, serverInfo.getServerUUID(), now, "", ""));
sessionCache.cacheSession(uuid, new Session(uuid, serverInfo.getServerUUID(), now, null, null));
processing.submit(processors.info().playerPageUpdateProcessor(uuid));
} catch (Exception e) {
errorHandler.log(L.WARN, this.getClass(), e);

2
PlanPluginBridge/pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.djrapitops</groupId>
<artifactId>PlanPluginBridge</artifactId>
<version>4.6.0-1</version>
<version>4.6.1</version>
<packaging>jar</packaging>
<name>${project.groupId}:${project.artifactId}</name>

7
PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/Protocol.java
View File

@ -36,11 +36,10 @@ public class Protocol {
*/
public static String getMCVersion(int protocolVersion) {
switch (protocolVersion) {
case 404:
return "1.13.2";
case 401:
return "1.13.1";
case 390:
case 391:
case 392:
case 393:
return "1.13";
case 340:
@ -68,7 +67,7 @@ public class Protocol {
case 4:
return "1.7.5";
default:
return "Unknown (" + protocolVersion + ")";
return "Newer than 1.13.2 (" + protocolVersion + ")";
}
}
}