Skip to content

Commit 8eeb9a2

Browse files
committed
Use Maven for the massive artifacts
1 parent 980409c commit 8eeb9a2

File tree

5 files changed

+17
-16
lines changed

5 files changed

+17
-16
lines changed

lib/Factions-1.6.9.5-U0.1.15.jar

-825 KB
Binary file not shown.

lib/Factions.jar

-311 KB
Binary file not shown.

lib/MassiveCore.jar

-1.28 MB
Binary file not shown.

pom.xml

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,16 @@
160160
<id>placeholderapi</id>
161161
<url>http://repo.extendedclip.com/content/repositories/placeholderapi/</url>
162162
</repository>
163+
164+
<repository>
165+
<id>massive-repo</id>
166+
<url>https://repo.dustplanet.de/artifactory/ext-release-local</url>
167+
</repository>
168+
169+
<repository>
170+
<id>turt2live-repo</id>
171+
<url>http://repo.turt2live.com/</url>
172+
</repository>
163173
</repositories>
164174

165175
<dependencies>
@@ -359,32 +369,23 @@
359369
<dependency>
360370
<groupId>com.massivecraft</groupId>
361371
<artifactId>FactionsUUID</artifactId>
372+
<!--the name can't be the same because maven would automatically use the newer version-->
362373
<!--Factions-UUID fork of 1.6/1.8-->
363374
<version>1.6.9.5-U0.1.6</version>
364-
<!--Make it possible to build automatically like https://github.com/drtshock/ObsidianDestroyer-->
365-
<scope>system</scope>
366-
<systemPath>${project.basedir}/lib/Factions-1.6.9.5-U0.1.15.jar</systemPath>
367375
<optional>true</optional>
368376
</dependency>
369377

370378
<dependency>
371379
<groupId>com.massivecraft</groupId>
372-
<!--the name can't be the same because maven would automatically use the newer version-->
373-
<artifactId>factions-2.7</artifactId>
374-
<!--2.7+-->
375-
<version>2.7.1</version>
376-
<scope>system</scope>
377-
<systemPath>${project.basedir}/lib/Factions.jar</systemPath>
378-
<optional>true</optional>
380+
<artifactId>factions</artifactId>
381+
<version>2.8.16</version>
379382
</dependency>
383+
380384
<!--MCore must be available for factions-->
381385
<dependency>
382386
<groupId>com.massivecraft</groupId>
383-
<artifactId>mcore</artifactId>
384-
<version>2.7.1</version>
385-
<scope>system</scope>
386-
<systemPath>${project.basedir}/lib/MassiveCore.jar</systemPath>
387-
<optional>true</optional>
387+
<artifactId>massivecore</artifactId>
388+
<version>2.8.6</version>
388389
</dependency>
389390

390391
<!--Testing environment-->

src/main/java/com/github/games647/scoreboardstats/variables/defaults/FactionsVariables.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ private void getNewFactionScore(Player player, String variable, ReplaceEvent rep
7777
//factions 1.6.9 and 1.8.2
7878
private void getOldFactionScore(Player player, String variable, ReplaceEvent replaceEvent) {
7979
//If factions doesn't track the player yet return -1
80-
FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player);
80+
FPlayer fPlayer = FPlayers.i.get(player);
8181
if (fPlayer == null) {
8282
return;
8383
}

0 commit comments

Comments
 (0)