3.7.88

ZombieStriker · Jun 2, 2019 · f017623 · f017623
1 parent 8ec8c6e
commit f017623
Show file tree

Hide file tree

Showing 24 changed files with 2,107 additions and 1,619 deletions.
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/LobbyAPI.iml b/LobbyAPI.iml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4" />
diff --git a/pom.xml b/pom.xml
@@ -1,57 +1,67 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>me.zombie_striker</groupId>
-	<artifactId>LobbyAPI</artifactId>
-	<version>3.7.86</version>
-	<repositories>
-		<repository>
-			<id>spigot-repo</id>
-			<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
-		</repository>
-	</repositories>
-	<build>
-		<finalName>${project.name}</finalName>
-		<defaultGoal>install</defaultGoal>
-		<!-- Uses the properties in this file for plugin.yml and config.yml -->
-		<resources>
-			<resource>
-				<directory>${basedir}/resources</directory>
-				<filtering>true</filtering>
-				<includes>
-					<include>plugin.yml</include>
-					<include>config.yml</include>
-				</includes>
-			</resource>
-		</resources>
-		<sourceDirectory>src</sourceDirectory>
-		<plugins>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.7.0</version>
-				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<!--Spigot API -->
-		<dependency>
-			<groupId>org.spigotmc</groupId>
-			<artifactId>spigot</artifactId>
-			<version>1.14.1-R0.1-SNAPSHOT</version>
-			<scope>provided</scope>
-		</dependency>
-		<!-- PluginConstructorAPI -->
-		<dependency>
-			<groupId>me.zombie_striker</groupId>
-			<artifactId>pluginconstructor</artifactId>
-			<version>1.0.50</version>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/libs/PluginConstructorAPI.jar</systemPath>
-		</dependency>
-	</dependencies>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>me.zombie_striker</groupId>
+    <artifactId>LobbyAPI</artifactId>
+    <version>3.7.88</version>
+    <repositories>
+
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+        </repository>
+    </repositories>
+    <build>
+        <finalName>${project.name}</finalName>
+        <defaultGoal>install</defaultGoal>
+        <!-- Uses the properties in this file for plugin.yml and config.yml -->
+        <resources>
+            <resource>
+                <directory>${basedir}/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>plugin.yml</include>
+                    <include>config.yml</include>
+                </includes>
+            </resource>
+        </resources>
+        <sourceDirectory>src</sourceDirectory>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.7.0</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <!--Spigot API-->
+        <!--You only need one of the two, don't put both. Spigot is recommended.-->
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot</artifactId>
+            <version>1.14.2-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- PluginConstructorAPI -->
+        <dependency>
+            <groupId>me.zombie_striker</groupId>
+            <artifactId>pluginconstructor</artifactId>
+            <version>1.0.50</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/libs/PluginConstructorAPI.jar</systemPath>
+        </dependency>
+    </dependencies>
 </project>
diff --git a/resources/changelog.txt b/resources/changelog.txt
@@ -1,3 +1,16 @@
+3.7.88
+    Added potion effects, saturation, bedspawns, compass, allowflight, air, and fireticks to the player's data per world.
+    Fixed xp levels not being saved correctly
+    Changed nether/end system to reduce memory since most of the values should be duplicated from the main world.
+    Cleaned up config. It should now be close to half the size as in previous updates
+    Code cleanup
+    Import cleanup
+
+3.7.87
+	Fixed portal XZ offset for nether portals
+	Added "Any" as an option for the default gamemode
+	Fixed issue where gamemodes change across netherportal/endportal teleportation.
+
 3.7.86
 	Fixed 1.13.
 	Fixed portals not giving items for some nether portals

diff --git a/resources/plugin.yml b/resources/plugin.yml
@@ -3,22 +3,22 @@ version: ${project.version}
 api-version: 1.13
 name: LobbyAPI
 commands:
- Lobby:
+  Lobby:
     description: Opens the world menu
     aliases: [hub]
- LobbyAPI:
+  LobbyAPI:
     description: Get access to all lobbyAPI commands
 permissions:
-   lobbyapi.*:
-     description: Gives access to all LobbyAPI features
-     children:
-       lobbyapi.commands: true
-       lobbyapi.user: true
-       lobbyapi.bypassworldlimits: true
-   lobbyapi.user:
-     default: true
-     description: Gives access that only a user should have, which is to access the hub command
-     children:
-       lobbyapi.hub: true
+  lobbyapi.*:
+    description: Gives access to all LobbyAPI features
+    children:
+      lobbyapi.commands: true
+      lobbyapi.user: true
+      lobbyapi.bypassworldlimits: true
+  lobbyapi.user:
+    default: true
+    description: Gives access that only a user should have, which is to access the hub command
+    children:
+      lobbyapi.hub: true
 author:
-   Zombie_Striker
+  Zombie_Striker
diff --git a/src/me/zombie_striker/lobbyapi/BungeeMessager.java b/src/me/zombie_striker/lobbyapi/BungeeMessager.java
@@ -1,10 +1,9 @@
 package me.zombie_striker.lobbyapi;
 
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.messaging.PluginMessageListener;
-
 import com.google.common.io.ByteArrayDataInput;
 import com.google.common.io.ByteStreams;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.messaging.PluginMessageListener;
 
 public class BungeeMessager implements PluginMessageListener {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<?xml version="1.0" encoding="UTF-8"?>
		<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4" />