Skip to content
This repository was archived by the owner on Jan 30, 2021. It is now read-only.

Commit 8b138d3

Browse files
committed
Made mobs and signs only available on lobby servers
1 parent 79b1b0a commit 8b138d3

24 files changed

Lines changed: 411 additions & 7 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22

33
target/*
44
dependency-reduced-pom.xml
5+
*.iml
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
4+
<output url="file://$MODULE_DIR$/target/classes" />
5+
<output-test url="file://$MODULE_DIR$/target/test-classes" />
6+
<content url="file://$MODULE_DIR$">
7+
<excludeFolder url="file://$MODULE_DIR$/target" />
8+
</content>
9+
<orderEntry type="inheritedJdk" />
10+
<orderEntry type="sourceFolder" forTests="false" />
11+
</component>
12+
</module>
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
4+
<output url="file://$MODULE_DIR$/target/classes" />
5+
<output-test url="file://$MODULE_DIR$/target/test-classes" />
6+
<content url="file://$MODULE_DIR$">
7+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
8+
<excludeFolder url="file://$MODULE_DIR$/target" />
9+
</content>
10+
<orderEntry type="inheritedJdk" />
11+
<orderEntry type="sourceFolder" forTests="false" />
12+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.24" level="project" />
13+
</component>
14+
</module>
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
4+
<output url="file://$MODULE_DIR$/target/classes" />
5+
<output-test url="file://$MODULE_DIR$/target/test-classes" />
6+
<content url="file://$MODULE_DIR$">
7+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
8+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
9+
<excludeFolder url="file://$MODULE_DIR$/target" />
10+
</content>
11+
<orderEntry type="inheritedJdk" />
12+
<orderEntry type="sourceFolder" forTests="false" />
13+
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md5:bungeecord-bootstrap:1.8-1.12" level="project" />
14+
<orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty-all:4.1.35.Final" level="project" />
15+
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
16+
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-io:commons-io:2.6" level="project" />
17+
<orderEntry type="library" scope="PROVIDED" name="Maven: jline:jline:2.14.6" level="project" />
18+
<orderEntry type="module" module-name="reformcloud-library" />
19+
</component>
20+
</module>
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
4+
<output url="file://$MODULE_DIR$/target/classes" />
5+
<output-test url="file://$MODULE_DIR$/target/test-classes" />
6+
<content url="file://$MODULE_DIR$">
7+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
8+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
9+
<excludeFolder url="file://$MODULE_DIR$/target" />
10+
</content>
11+
<orderEntry type="inheritedJdk" />
12+
<orderEntry type="sourceFolder" forTests="false" />
13+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.13" level="project" />
14+
<orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty-all:4.1.35.Final" level="project" />
15+
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
16+
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-io:commons-io:2.6" level="project" />
17+
<orderEntry type="library" scope="PROVIDED" name="Maven: jline:jline:2.14.6" level="project" />
18+
<orderEntry type="module" module-name="reformcloud-library" />
19+
</component>
20+
</module>

reformcloud-global/reformcloud-api/reformcloud-api-spigot/src/main/java/systems/reformcloud/network/in/PacketInInitializeInternal.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import systems.reformcloud.ReformCloudAPISpigot;
88
import systems.reformcloud.configurations.Configuration;
9+
import systems.reformcloud.meta.enums.ServerModeType;
910
import systems.reformcloud.meta.enums.ServerState;
1011
import systems.reformcloud.mobsaddon.MobSelector;
1112
import systems.reformcloud.network.interfaces.NetworkInboundHandler;
@@ -29,13 +30,15 @@ public void handle(Configuration configuration) {
2930
"AuthSuccess", new Configuration().addStringValue("name", ReformCloudAPISpigot.getInstance().getServerInfo().getCloudProcess().getName())
3031
));
3132

32-
try {
33-
new SignSelector();
34-
} catch (Throwable throwable) {
35-
throwable.printStackTrace();
36-
}
33+
if (ReformCloudAPISpigot.getInstance().getServerInfo().getServerGroup().getServerModeType().equals(ServerModeType.LOBBY)) {
34+
try {
35+
new SignSelector();
36+
} catch (Throwable throwable) {
37+
throwable.printStackTrace();
38+
}
3739

38-
new MobSelector();
40+
new MobSelector();
41+
}
3942

4043
ReformCloudAPISpigot.getInstance().getServerInfo().setServerState(ServerState.READY);
4144
ReformCloudAPISpigot.getInstance().sendPacketSync("ReformCloudController", new PacketOutServerInfoUpdate(
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
4+
<output url="file://$MODULE_DIR$/target/classes" />
5+
<output-test url="file://$MODULE_DIR$/target/test-classes" />
6+
<content url="file://$MODULE_DIR$">
7+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
8+
<excludeFolder url="file://$MODULE_DIR$/target" />
9+
</content>
10+
<orderEntry type="inheritedJdk" />
11+
<orderEntry type="sourceFolder" forTests="false" />
12+
<orderEntry type="library" scope="PROVIDED" name="Maven: com.velocitypowered:velocity-api:1.0-SNAPSHOT" level="project" />
13+
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:25.1-jre" level="project" />
14+
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
15+
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.errorprone:error_prone_annotations:2.1.3" level="project" />
16+
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.j2objc:j2objc-annotations:1.1" level="project" />
17+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.14" level="project" />
18+
<orderEntry type="library" scope="PROVIDED" name="Maven: net.kyori:text:1.12-1.6.5" level="project" />
19+
<orderEntry type="library" scope="PROVIDED" name="Maven: com.moandjiezana.toml:toml4j:0.7.2" level="project" />
20+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
21+
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.inject:guice:4.2.0" level="project" />
22+
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.inject:javax.inject:1" level="project" />
23+
<orderEntry type="library" scope="PROVIDED" name="Maven: aopalliance:aopalliance:1.0" level="project" />
24+
<orderEntry type="library" scope="PROVIDED" name="Maven: org.checkerframework:checker-qual:2.7.0" level="project" />
25+
<orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty-all:4.1.35.Final" level="project" />
26+
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
27+
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-io:commons-io:2.6" level="project" />
28+
<orderEntry type="library" scope="PROVIDED" name="Maven: jline:jline:2.14.6" level="project" />
29+
<orderEntry type="module" module-name="reformcloud-library" />
30+
</component>
31+
</module>
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
4+
<output url="file://$MODULE_DIR$/target/classes" />
5+
<output-test url="file://$MODULE_DIR$/target/test-classes" />
6+
<content url="file://$MODULE_DIR$">
7+
<excludeFolder url="file://$MODULE_DIR$/target" />
8+
</content>
9+
<orderEntry type="inheritedJdk" />
10+
<orderEntry type="sourceFolder" forTests="false" />
11+
<orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty-all:4.1.35.Final" level="project" />
12+
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
13+
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-io:commons-io:2.6" level="project" />
14+
<orderEntry type="library" scope="PROVIDED" name="Maven: jline:jline:2.14.6" level="project" />
15+
<orderEntry type="module" module-name="reformcloud-library" />
16+
</component>
17+
</module>
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
4+
<output url="file://$MODULE_DIR$/target/classes" />
5+
<output-test url="file://$MODULE_DIR$/target/test-classes" />
6+
<content url="file://$MODULE_DIR$">
7+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
8+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
9+
<excludeFolder url="file://$MODULE_DIR$/target" />
10+
</content>
11+
<orderEntry type="inheritedJdk" />
12+
<orderEntry type="sourceFolder" forTests="false" />
13+
<orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty-all:4.1.35.Final" level="project" />
14+
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
15+
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-io:commons-io:2.6" level="project" />
16+
<orderEntry type="library" scope="PROVIDED" name="Maven: jline:jline:2.14.6" level="project" />
17+
<orderEntry type="module" module-name="reformcloud-yaml" />
18+
<orderEntry type="module" module-name="reformcloud-library" />
19+
</component>
20+
</module>
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
4+
<output url="file://$MODULE_DIR$/target/classes" />
5+
<output-test url="file://$MODULE_DIR$/target/test-classes" />
6+
<content url="file://$MODULE_DIR$">
7+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
8+
<excludeFolder url="file://$MODULE_DIR$/target" />
9+
</content>
10+
<orderEntry type="inheritedJdk" />
11+
<orderEntry type="sourceFolder" forTests="false" />
12+
<orderEntry type="library" scope="PROVIDED" name="Maven: io.netty:netty-all:4.1.35.Final" level="project" />
13+
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
14+
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-io:commons-io:2.6" level="project" />
15+
<orderEntry type="library" scope="PROVIDED" name="Maven: jline:jline:2.14.6" level="project" />
16+
<orderEntry type="module" module-name="reformcloud-library" />
17+
</component>
18+
</module>

0 commit comments

Comments
 (0)