Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-08-22 12:42:52 +02:00
Code Issues Projects Releases Wiki Activity

3.6.0

Browse Source
This commit is contained in:
Rsl1122 2017-08-01 08:10:22 +03:00
parent af87754219
commit 43205718c7
9 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Plan/.idea/libraries/Maven__com_djrapitops_PlanPluginBridge_3_6_0.xml Normal file
View File

@ -0,0 +1,14 @@
<component name="libraryTable">
<library name="Maven: com.djrapitops:PlanPluginBridge:3.6.0">
<CLASSES>
<root url="jar://$PROJECT_DIR$/../PlanPluginBridge/PlanPluginBridge-3.6.0.jar!/" />
<root url="file://$PROJECT_DIR$/../PlanPluginBridge" />
<root url="file://$PROJECT_DIR$/../PlanPluginBridge" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="file://$PROJECT_DIR$/../PlanPluginBridge/src/main/java" />
</SOURCES>
<jarDirectory url="file://$PROJECT_DIR$/../PlanPluginBridge" recursive="false" />
</library>
</component>

4
Plan/pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.djrapitops</groupId>
<artifactId>Plan</artifactId>
<version>3.5.5</version>
<version>3.6.0</version>
<packaging>jar</packaging>
<repositories>
<repository>
@ -35,7 +35,7 @@
<dependency>
<groupId>com.djrapitops</groupId>
<artifactId>PlanPluginBridge</artifactId>
<version>3.5.0</version>
<version>3.6.0</version>
<scope>compile</scope>
</dependency>
<!-- -->

4
Plan/src/main/resources/analysis.html
View File

@ -581,7 +581,7 @@
</div>
</div>
</div>
<table class="sortable table">
<table class="sortable table" style="height: 100%; max-height: 800px; overflow: auto;">
<thead>
<tr>
<th><i class="fa fa-user" aria-hidden="true"></i> Player</th>
@ -622,7 +622,7 @@
</div>
</div>
</div>
<table class="sortable table">
<table class="sortable table" style="height: 100%; max-height: 800px; overflow: auto;">
<thead>
<tr>
<th><i class="fa fa-chevron-right" aria-hidden="true"></i> Command</th>

3
Plan/src/main/resources/plugin.yml
View File

@ -1,8 +1,7 @@
name: Plan
author: Rsl1122
main: main.java.com.djrapitops.plan.Plan
version: 3.5.5
version: 3.6.0
softdepend:
- OnTime
- EssentialsX

4
PlanPluginBridge/.idea/artifacts/PlanPluginBridge_3_5_0.xml → PlanPluginBridge/.idea/artifacts/PlanPluginBridge_3_6_0.xml
View File

@ -1,7 +1,7 @@
<component name="ArtifactManager">
<artifact type="jar" name="PlanPluginBridge-3.5.0">
<artifact type="jar" name="PlanPluginBridge-3.6.0">
<output-path>$PROJECT_DIR$/target</output-path>
<root id="archive" name="PlanPluginBridge-3.5.0.jar">
<root id="archive" name="PlanPluginBridge-3.6.0.jar">
<element id="module-output" name="PlanPluginBridge" />
</root>
</artifact>

14
PlanPluginBridge/.idea/libraries/Maven__com_djrapitops_Plan_3_6_0.xml Normal file
View File

@ -0,0 +1,14 @@
<component name="libraryTable">
<library name="Maven: com.djrapitops:Plan:3.6.0">
<CLASSES>
<root url="file://$PROJECT_DIR$/../Plan" />
<root url="jar://$PROJECT_DIR$/../Plan/target/Plan.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="file://$PROJECT_DIR$/../Plan/classes/artifacts/Maven__com_djrapitops_AbstractPluginFramework_2_0_0/src/main/java" />
<root url="file://$PROJECT_DIR$/../Plan/classes/artifacts/Maven__com_djrapitops_AbstractPluginFramework_2_0_0/src/test/java" />
<root url="file://$PROJECT_DIR$/../Plan/src" />
</SOURCES>
</library>
</component>

BIN
PlanPluginBridge/PlanPluginBridge-3.5.0.jar
View File

Binary file not shown.

4
PlanPluginBridge/pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.djrapitops</groupId>
<artifactId>PlanPluginBridge</artifactId>
<version>3.5.0</version>
<version>3.6.0</version>
<packaging>jar</packaging>
<repositories>
<repository>
@ -23,7 +23,7 @@
<dependency>
<groupId>com.djrapitops</groupId>
<artifactId>Plan</artifactId>
<version>3.5.5</version>
<version>3.6.0</version>
<scope>provided</scope>
</dependency>
<dependency>

4
PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/importing/OnTimeImporter.java
View File

@ -47,9 +47,7 @@ public class OnTimeImporter extends Importer {
}
if (playTime > uData.getPlayTime()) {
uData.setPlayTime(playTime);
uData.setLastGamemode("SURVIVAL");
uData.setAllGMTimes(playTime, 0, 0, 0);
uData.setLastGmSwapTime(playTime);
uData.getGmTimes().resetTimes(playTime);
}
return true;
}