mirror/Mineplex
mirror/Mineplex
1
Fork 0
Code Releases Activity

Bug Fixes

Browse Source 
See #changelogs for details
This commit is contained in:
Daniel Waggner 2021-06-05 09:21:13 -07:00
parent eee2b297ae
commit 041cc65b16
24 changed files with 40 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/libraries/Maven__com_mineplex_spigot_1_8_8_1_9_SNAPSHOT.xml
View File

@ -8,6 +8,7 @@
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/mineplex/spigot/1.8.8-1.9-SNAPSHOT/spigot-1.8.8-1.9-SNAPSHOT-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/com/mineplex/spigot/1.8.8-1.9-SNAPSHOT/spigot-1.8.8-1.9-SNAPSHOT-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/mineplex/spigot/1.8.8-1.9-SNAPSHOT/spigot-1.8.8-1.9-SNAPSHOT.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
</component> </component>

13
.idea/libraries/Maven__commons_io_commons_io_2_5.xml
View File

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: com.google.protobuf:protobuf-java:3.11.4">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/protobuf/protobuf-java/3.11.4/protobuf-java-3.11.4.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/google/protobuf/protobuf-java/3.11.4/protobuf-java-3.11.4-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/protobuf/protobuf-java/3.11.4/protobuf-java-3.11.4-sources.jar!/" />
</SOURCES>
</library>
</component>

8
.idea/libraries/Maven__org_jetbrains_annotations_20_1_0.xml → .idea/libraries/Maven__org_jetbrains_annotations_21_0_1.xml
View File

@ -1,13 +1,13 @@
<component name="libraryTable"> <component name="libraryTable">
<library name="Maven: org.jetbrains:annotations:20.1.0"> <library name="Maven: org.jetbrains:annotations:21.0.1">
<CLASSES> <CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/20.1.0/annotations-20.1.0.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/21.0.1/annotations-21.0.1.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/20.1.0/annotations-20.1.0-javadoc.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/21.0.1/annotations-21.0.1-javadoc.jar!/" />
</JAVADOC> </JAVADOC>
<SOURCES> <SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/20.1.0/annotations-20.1.0-sources.jar!/" /> <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/21.0.1/annotations-21.0.1-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
</component> </component>

19
Mineplex.Cache/mineplex-cache.iml
View File

@ -9,15 +9,6 @@
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="mineplex-serverdata" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.2.1" level="project" />
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.14" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-dbcp2:2.0.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.2" level="project" />
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.3" level="project" />
<orderEntry type="library" name="Maven: redis.clients:jedis:2.8.1" level="project" />
<orderEntry type="library" name="Maven: org.jooq:jooq:3.5.2" level="project" />
<orderEntry type="library" name="Maven: com.mineplex:spigot:1.8.8-1.9-SNAPSHOT" level="project" />
<orderEntry type="module-library"> <orderEntry type="module-library">
<library> <library>
<CLASSES> <CLASSES>
@ -27,5 +18,15 @@
<SOURCES /> <SOURCES />
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="module" module-name="mineplex-serverdata" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.2.1" level="project" />
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.14" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-dbcp2:2.0.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.2" level="project" />
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.3" level="project" />
<orderEntry type="library" name="Maven: redis.clients:jedis:2.8.1" level="project" />
<orderEntry type="library" name="Maven: org.jooq:jooq:3.5.2" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:21.0" level="project" />
<orderEntry type="library" name="Maven: com.mineplex:spigot:1.8.8-1.9-SNAPSHOT" level="project" />
</component> </component>
</module> </module>

2
Mineplex.Core/mineplex-core.iml
View File

@ -46,7 +46,7 @@
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:21.0" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:guava:21.0" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains:annotations:20.1.0" level="project" /> <orderEntry type="library" name="Maven: org.jetbrains:annotations:21.0.1" level="project" />
<orderEntry type="library" name="Maven: org.mariadb.jdbc:mariadb-java-client:3.0.0-alpha" level="project" /> <orderEntry type="library" name="Maven: org.mariadb.jdbc:mariadb-java-client:3.0.0-alpha" level="project" />
</component> </component>
</module> </module>

BIN
Mineplex.Core/target/classes/mineplex/core/game/kit/GameKit$3.class
View File

Binary file not shown.

BIN
Mineplex.Core/target/classes/mineplex/core/game/kit/GameKit$4.class
View File

Binary file not shown.

BIN
Mineplex.Core/target/classes/mineplex/core/game/kit/GameKit$5.class
View File

Binary file not shown.

BIN
Mineplex.Core/target/classes/mineplex/core/game/kit/GameKit.class
View File

Binary file not shown.

2
Mineplex.Hub/mineplex-hub.iml
View File

@ -40,7 +40,7 @@
<orderEntry type="library" name="Maven: org.tukaani:xz:1.5" level="project" /> <orderEntry type="library" name="Maven: org.tukaani:xz:1.5" level="project" />
<orderEntry type="library" name="Maven: com.warrenstrange:googleauth:1.1.1" level="project" /> <orderEntry type="library" name="Maven: com.warrenstrange:googleauth:1.1.1" level="project" />
<orderEntry type="library" name="Maven: com.google.zxing:core:3.3.0" level="project" /> <orderEntry type="library" name="Maven: com.google.zxing:core:3.3.0" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains:annotations:20.1.0" level="project" /> <orderEntry type="library" name="Maven: org.jetbrains:annotations:21.0.1" level="project" />
<orderEntry type="library" name="Maven: org.mariadb.jdbc:mariadb-java-client:3.0.0-alpha" level="project" /> <orderEntry type="library" name="Maven: org.mariadb.jdbc:mariadb-java-client:3.0.0-alpha" level="project" />
<orderEntry type="module" module-name="mineplex-core-common" /> <orderEntry type="module" module-name="mineplex-core-common" />
<orderEntry type="library" name="Maven: com.mineplex:spigot:1.8.8-1.9-SNAPSHOT" level="project" /> <orderEntry type="library" name="Maven: com.mineplex:spigot:1.8.8-1.9-SNAPSHOT" level="project" />

2
Mineplex.Minecraft.Game.ClassCombat/mineplex-minecraft-game-classcombat.iml
View File

@ -41,7 +41,7 @@
<orderEntry type="library" name="Maven: org.tukaani:xz:1.5" level="project" /> <orderEntry type="library" name="Maven: org.tukaani:xz:1.5" level="project" />
<orderEntry type="library" name="Maven: com.warrenstrange:googleauth:1.1.1" level="project" /> <orderEntry type="library" name="Maven: com.warrenstrange:googleauth:1.1.1" level="project" />
<orderEntry type="library" name="Maven: com.google.zxing:core:3.3.0" level="project" /> <orderEntry type="library" name="Maven: com.google.zxing:core:3.3.0" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains:annotations:20.1.0" level="project" /> <orderEntry type="library" name="Maven: org.jetbrains:annotations:21.0.1" level="project" />
<orderEntry type="library" name="Maven: org.mariadb.jdbc:mariadb-java-client:3.0.0-alpha" level="project" /> <orderEntry type="library" name="Maven: org.mariadb.jdbc:mariadb-java-client:3.0.0-alpha" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:21.0" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:guava:21.0" level="project" />
</component> </component>

2
Mineplex.Minecraft.Game.Core/mineplex-minecraft-game-core.iml
View File

@ -40,7 +40,7 @@
<orderEntry type="library" name="Maven: org.tukaani:xz:1.5" level="project" /> <orderEntry type="library" name="Maven: org.tukaani:xz:1.5" level="project" />
<orderEntry type="library" name="Maven: com.warrenstrange:googleauth:1.1.1" level="project" /> <orderEntry type="library" name="Maven: com.warrenstrange:googleauth:1.1.1" level="project" />
<orderEntry type="library" name="Maven: com.google.zxing:core:3.3.0" level="project" /> <orderEntry type="library" name="Maven: com.google.zxing:core:3.3.0" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains:annotations:20.1.0" level="project" /> <orderEntry type="library" name="Maven: org.jetbrains:annotations:21.0.1" level="project" />
<orderEntry type="library" name="Maven: org.mariadb.jdbc:mariadb-java-client:3.0.0-alpha" level="project" /> <orderEntry type="library" name="Maven: org.mariadb.jdbc:mariadb-java-client:3.0.0-alpha" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:21.0" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:guava:21.0" level="project" />
</component> </component>

17
Mineplex.ServerData/mineplex-serverdata.iml
View File

@ -9,14 +9,6 @@
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.2.1" level="project" />
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.14" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-dbcp2:2.0.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.2" level="project" />
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.3" level="project" />
<orderEntry type="library" name="Maven: redis.clients:jedis:2.8.1" level="project" />
<orderEntry type="library" name="Maven: org.jooq:jooq:3.5.2" level="project" />
<orderEntry type="library" name="Maven: com.mineplex:spigot:1.8.8-1.9-SNAPSHOT" level="project" />
<orderEntry type="module-library"> <orderEntry type="module-library">
<library> <library>
<CLASSES> <CLASSES>
@ -26,5 +18,14 @@
<SOURCES /> <SOURCES />
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.2.1" level="project" />
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.14" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-dbcp2:2.0.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.2" level="project" />
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.3" level="project" />
<orderEntry type="library" name="Maven: redis.clients:jedis:2.8.1" level="project" />
<orderEntry type="library" name="Maven: org.jooq:jooq:3.5.2" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:21.0" level="project" />
<orderEntry type="library" name="Maven: com.mineplex:spigot:1.8.8-1.9-SNAPSHOT" level="project" />
</component> </component>
</module> </module>

2
Mineplex.StaffServer/mineplex-staffserver.iml
View File

@ -38,7 +38,7 @@
<orderEntry type="library" name="Maven: com.warrenstrange:googleauth:1.1.1" level="project" /> <orderEntry type="library" name="Maven: com.warrenstrange:googleauth:1.1.1" level="project" />
<orderEntry type="library" name="Maven: com.google.zxing:core:3.3.0" level="project" /> <orderEntry type="library" name="Maven: com.google.zxing:core:3.3.0" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:21.0" level="project" /> <orderEntry type="library" name="Maven: com.google.guava:guava:21.0" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains:annotations:20.1.0" level="project" /> <orderEntry type="library" name="Maven: org.jetbrains:annotations:21.0.1" level="project" />
<orderEntry type="library" name="Maven: org.mariadb.jdbc:mariadb-java-client:3.0.0-alpha" level="project" /> <orderEntry type="library" name="Maven: org.mariadb.jdbc:mariadb-java-client:3.0.0-alpha" level="project" />
<orderEntry type="module" module-name="mineplex-core-common" /> <orderEntry type="module" module-name="mineplex-core-common" />
<orderEntry type="library" name="Maven: com.mineplex:spigot:1.8.8-1.9-SNAPSHOT" level="project" /> <orderEntry type="library" name="Maven: com.mineplex:spigot:1.8.8-1.9-SNAPSHOT" level="project" />

2
Nautilus.Game.Arcade/nautilus-game-arcade.iml
View File

@ -40,7 +40,7 @@
<orderEntry type="library" name="Maven: org.tukaani:xz:1.5" level="project" /> <orderEntry type="library" name="Maven: org.tukaani:xz:1.5" level="project" />
<orderEntry type="library" name="Maven: com.warrenstrange:googleauth:1.1.1" level="project" /> <orderEntry type="library" name="Maven: com.warrenstrange:googleauth:1.1.1" level="project" />
<orderEntry type="library" name="Maven: com.google.zxing:core:3.3.0" level="project" /> <orderEntry type="library" name="Maven: com.google.zxing:core:3.3.0" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains:annotations:20.1.0" level="project" /> <orderEntry type="library" name="Maven: org.jetbrains:annotations:21.0.1" level="project" />
<orderEntry type="library" name="Maven: org.mariadb.jdbc:mariadb-java-client:3.0.0-alpha" level="project" /> <orderEntry type="library" name="Maven: org.mariadb.jdbc:mariadb-java-client:3.0.0-alpha" level="project" />
<orderEntry type="module" module-name="mineplex-core-common" /> <orderEntry type="module" module-name="mineplex-core-common" />
<orderEntry type="module" module-name="mineplex-core-common-base" /> <orderEntry type="module" module-name="mineplex-core-common-base" />

1
Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
View File

@ -1006,7 +1006,6 @@ public class ArcadeManager extends MiniPlugin implements IRelation
} }
} }
//Added random comment to test that the gitignore is properly set-up Take 3
boolean nullGame = _game == null; boolean nullGame = _game == null;
GameDisplay game = null; GameDisplay game = null;

12
Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/lobby/LobbyManager.java
View File

@ -263,7 +263,7 @@ public abstract class LobbyManager implements Listener
return; return;
} }
_advertiseStage = (_advertiseStage + 1) % 7; _advertiseStage = (_advertiseStage + 1) % 8;
if (_manager.GetGame().AdvertiseText(this, _advertiseStage)) if (_manager.GetGame().AdvertiseText(this, _advertiseStage))
{ {
@ -274,7 +274,7 @@ public abstract class LobbyManager implements Listener
{ {
writeAdvertiseLine("#REVIVECS", 0, 159, (byte) 4); writeAdvertiseLine("#REVIVECS", 0, 159, (byte) 4);
writeAdvertiseLine("AND DUTTY CAN'T", 1, 159, (byte) 15); writeAdvertiseLine("AND DUTTY CAN'T", 1, 159, (byte) 15);
writeAdvertiseLine("STOP US!", 2, 159, (byte) 15); writeAdvertiseLine("STOP US!", 2, 159, (byte) 4);
writeAdvertiseLine("tiny.cc/ReviveCS", 4, 159, (byte) 15); writeAdvertiseLine("tiny.cc/ReviveCS", 4, 159, (byte) 15);
} }
@ -324,6 +324,14 @@ public abstract class LobbyManager implements Listener
writeAdvertiseLine("SAY \"FINE, WE'LL", 1, 159, (byte) 15); writeAdvertiseLine("SAY \"FINE, WE'LL", 1, 159, (byte) 15);
writeAdvertiseLine("DO IT OURSELVES\"", 2, 159, (byte) 4); writeAdvertiseLine("DO IT OURSELVES\"", 2, 159, (byte) 4);
writeAdvertiseLine("tiny.cc/ReviveCS", 4, 159, (byte) 15);
}
else if (_advertiseStage == 7)
{
writeAdvertiseLine("#REVIVECS", 0, 159, (byte) 4);
writeAdvertiseLine("#CSBEST", 1, 159, (byte) 15);
writeAdvertiseLine("#CSGIRULEZ", 2, 159, (byte) 4);
writeAdvertiseLine("tiny.cc/ReviveCS", 4, 159, (byte) 15); writeAdvertiseLine("tiny.cc/ReviveCS", 4, 159, (byte) 15);
} }
} }

BIN
Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/ArcadeManager.class
View File

Binary file not shown.

BIN
Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeKing.class
View File

Binary file not shown.

BIN
Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/kits/KitUndeadZombie2.class Normal file
View File

Binary file not shown.

BIN
Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/christmasnew/section/one/Section1$1.class
View File

Binary file not shown.

BIN
Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/team/TeamRequestsModule$1.class
View File

Binary file not shown.

BIN
Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/managers/lobby/LobbyManager.class
View File

Binary file not shown.

BIN
out/artifacts/nautilus_game_arcade_jar/nautilus-game-arcade.jar
View File

Binary file not shown.