From eed090ab287c8c0373abc079e3227a0fb6823c47 Mon Sep 17 00:00:00 2001
From: Zombie_Striker <dannyboyhn@yahoo.com>
Date: Sat, 6 Jul 2019 18:05:58 -0400
Subject: [PATCH] 3.7.92

---
 .idea/workspace.xml                      | 105 +++++++++++------------
 pom.xml                                  |  10 ++-
 resources/changelog.txt                  |   4 +
 src/me/zombie_striker/lobbyapi/Main.java |  17 +++-
 4 files changed, 77 insertions(+), 59 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index adf8ce0..9ded96a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -23,15 +23,12 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/me/zombie_striker/lobbyapi/Main.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="306">
-              <caret line="374" column="36" lean-forward="true" selection-start-line="374" selection-start-column="36" selection-end-line="374" selection-end-column="36" />
+            <state relative-caret-position="275">
+              <caret line="424" column="13" lean-forward="true" selection-start-line="424" selection-start-column="13" selection-end-line="424" selection-end-column="13" />
               <folding>
                 <element signature="imports" expanded="true" />
-                <element signature="e#28649#28650#0" expanded="true" />
-                <element signature="e#46563#46564#0" expanded="true" />
-                <element signature="e#46633#46634#0" expanded="true" />
-                <element signature="e#46705#46706#0" expanded="true" />
-                <element signature="e#46779#46780#0" expanded="true" />
+                <element signature="e#46878#46879#0" expanded="true" />
+                <element signature="e#46905#46906#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -71,7 +68,7 @@
         <entry file="file://$PROJECT_DIR$/pom.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="102">
-              <caret line="6" column="19" selection-start-line="6" selection-start-column="19" selection-end-line="6" selection-end-column="19" />
+              <caret line="6" column="18" selection-start-line="6" selection-start-column="18" selection-end-line="6" selection-end-column="18" />
             </state>
           </provider>
         </entry>
@@ -88,7 +85,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/me/zombie_striker/lobbyapi/LobbyAPI.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="10795">
+            <state relative-caret-position="618">
               <caret line="715" column="28" selection-start-line="715" selection-start-column="28" selection-end-line="715" selection-end-column="28" />
             </state>
           </provider>
@@ -110,8 +107,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/resources/changelog.txt">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="748">
-              <caret line="44" column="46" selection-start-line="44" selection-start-column="46" selection-end-line="44" selection-end-column="46" />
+            <state relative-caret-position="187">
+              <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
             </state>
           </provider>
         </entry>
@@ -136,11 +133,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>loadin</find>
-      <find>bedsp</find>
-      <find>getlobb</find>
-      <find>setLastLocationForWorld</find>
-      <find>portallocations</find>
       <find>respaw</find>
       <find>getplayers</find>
       <find>broadcast</find>
@@ -163,8 +155,14 @@
       <find>loadinv</find>
       <find>isdobe</find>
       <find>advan</find>
-      <find>portaleve</find>
       <find>entitytype.</find>
+      <find>changewor</find>
+      <find>portaleve</find>
+      <find>advance</find>
+      <find>adva</find>
+      <find>award</find>
+      <find>end</find>
+      <find>_end</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -182,8 +180,8 @@
         <option value="$PROJECT_DIR$/src/me/zombie_striker/lobbyapi/utils/portalgroup/PortalGroup.java" />
         <option value="$PROJECT_DIR$/src/me/zombie_striker/lobbyapi/utils/portalgroup/NetherPortalFinder.java" />
         <option value="$PROJECT_DIR$/pom.xml" />
-        <option value="$PROJECT_DIR$/resources/changelog.txt" />
         <option value="$PROJECT_DIR$/src/me/zombie_striker/lobbyapi/Main.java" />
+        <option value="$PROJECT_DIR$/resources/changelog.txt" />
       </list>
     </option>
   </component>
@@ -268,8 +266,8 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -361,7 +359,7 @@
     <frame x="-8" y="-8" width="1936" height="1176" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.15831557" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.16151386" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -371,7 +369,7 @@
       <window_info id="Favorites" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32950193" />
-      <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.49946696" visible="true" weight="0.32950193" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49946696" weight="0.32950193" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -444,21 +442,6 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/me/zombie_striker/lobbyapi/utils/portalgroup/P312312132132ortal.java" />
-    <entry file="file://$PROJECT_DIR$/src/me/zombie_striker/lobbyapi/Main.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="306">
-          <caret line="374" column="36" lean-forward="true" selection-start-line="374" selection-start-column="36" selection-end-line="374" selection-end-column="36" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#28649#28650#0" expanded="true" />
-            <element signature="e#46563#46564#0" expanded="true" />
-            <element signature="e#46633#46634#0" expanded="true" />
-            <element signature="e#46705#46706#0" expanded="true" />
-            <element signature="e#46779#46780#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/me/zombie_striker/lobbyapi/utils/portalgroup/NetherPortalFinder.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1802">
@@ -485,49 +468,61 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
+    <entry file="file://$PROJECT_DIR$/src/me/zombie_striker/lobbyapi/LobbyWorld.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <caret line="6" column="19" selection-start-line="6" selection-start-column="19" selection-end-line="6" selection-end-column="19" />
+        <state relative-caret-position="357">
+          <caret line="39" column="22" selection-start-line="39" selection-start-column="22" selection-end-line="39" selection-end-column="22" />
+          <folding>
+            <element signature="e#2599#2600#0" expanded="true" />
+            <element signature="e#2619#2620#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/me/zombie_striker/lobbyapi/BungeeMessager.java">
+    <entry file="file://$PROJECT_DIR$/resources/plugin.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        <state relative-caret-position="17">
+          <caret line="1" column="9" selection-start-line="1" selection-start-column="9" selection-end-line="1" selection-end-column="27" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/me/zombie_striker/lobbyapi/LobbyAPI.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="10795">
+        <state relative-caret-position="618">
           <caret line="715" column="28" selection-start-line="715" selection-start-column="28" selection-end-line="715" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/me/zombie_striker/lobbyapi/LobbyWorld.java">
+    <entry file="file://$PROJECT_DIR$/src/me/zombie_striker/lobbyapi/BungeeMessager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="39" column="22" selection-start-line="39" selection-start-column="22" selection-end-line="39" selection-end-column="22" />
-          <folding>
-            <element signature="e#2599#2600#0" expanded="true" />
-            <element signature="e#2619#2620#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="68">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="102">
+          <caret line="6" column="18" selection-start-line="6" selection-start-column="18" selection-end-line="6" selection-end-column="18" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/resources/changelog.txt">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="44" column="46" selection-start-line="44" selection-start-column="46" selection-end-line="44" selection-end-column="46" />
+        <state relative-caret-position="187">
+          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/resources/plugin.yml">
+    <entry file="file://$PROJECT_DIR$/src/me/zombie_striker/lobbyapi/Main.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="17">
-          <caret line="1" column="9" selection-start-line="1" selection-start-column="9" selection-end-line="1" selection-end-column="27" />
+        <state relative-caret-position="275">
+          <caret line="424" column="13" lean-forward="true" selection-start-line="424" selection-start-column="13" selection-end-line="424" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#46878#46879#0" expanded="true" />
+            <element signature="e#46905#46906#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/pom.xml b/pom.xml
index 884e64a..5fba802 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>me.zombie_striker</groupId>
     <artifactId>LobbyAPI</artifactId>
-    <version>3.7.91</version>
+    <version>3.7.92</version>
     <repositories>
 
         <repository>
@@ -26,6 +26,14 @@
                     <include>config.yml</include>
                 </includes>
             </resource>
+            <resource>
+                <directory>src</directory>
+                <targetPath>src</targetPath>
+                <includes>
+                    <include>**/*.java</include>
+                    <include>**/*.gwt.xml</include>
+                </includes>
+            </resource>
         </resources>
         <sourceDirectory>src</sourceDirectory>
         <plugins>
diff --git a/resources/changelog.txt b/resources/changelog.txt
index ad73099..71ec3fb 100644
--- a/resources/changelog.txt
+++ b/resources/changelog.txt
@@ -1,3 +1,7 @@
+3.7.92
+    Fixed per-world advancements.
+    Fixed bed spawn location per world.
+
 3.7.91
     Added option for saving advancements per world
     Fixed crash on enderdragon being killed
diff --git a/src/me/zombie_striker/lobbyapi/Main.java b/src/me/zombie_striker/lobbyapi/Main.java
index f339ad7..0f890f9 100644
--- a/src/me/zombie_striker/lobbyapi/Main.java
+++ b/src/me/zombie_striker/lobbyapi/Main.java
@@ -395,11 +395,17 @@ private void onTeleport(EntityPortalEvent event) {
 	@EventHandler(priority = EventPriority.LOWEST)
 	private void onTeleport(PlayerPortalEvent event) {
 		LobbyWorld curr = LobbyAPI.getLobbyWorld(event.getFrom().getWorld());
+		saveInventory(event.getPlayer(),curr);
 		Location to = handlePortalConversion(event.getPlayer(), curr, event.getFrom(), event.getTo(), event.getCause(),
 				event);
 		if (to != null) {
 			event.setTo(to);
 		}
+		new BukkitRunnable(){
+			public void run(){
+				loadInventory(event.getPlayer(),event.getPlayer().getWorld());
+			}
+		}.runTaskLater(this,5);
 	}
 
 	private Location handlePortalConversion(Entity to, LobbyWorld curr, Location getFrom, Location getTo,
@@ -713,7 +719,7 @@ private void loadInventory(Player p, LobbyWorld lw) {
 			p.setFireTicks(config.getInt(p.getName() + "." + s + ".fireticks"));
 		try {
 			if (config.contains(p.getName() + "." + s + ".bedspawn"))
-				p.setBedSpawnLocation((Location) config.get(p.getName() + "." + s + ".bedspawn"));
+				p.setBedSpawnLocation((Location) config.get(p.getName() + "." + s + ".bedspawn"),true);
 		} catch (Error | Exception e45) {
 		}
 		if (config.contains(p.getName() + "." + s + ".saturation"))
@@ -727,7 +733,9 @@ private void loadInventory(Player p, LobbyWorld lw) {
 	if(config.contains(p.getName()+"."+s+".advancements"))
 		try{
 			Iterator<org.bukkit.advancement.Advancement> it = Bukkit.advancementIterator();
-			for(org.bukkit.advancement.Advancement a = it.next(); it.hasNext();it.next()){
+			for(org.bukkit.advancement.Advancement a = it.next(); it.hasNext();a=it.next()){
+				if(a.getKey().getKey().startsWith("recipes"))
+					continue;
 				Collection<String> awarded = config.getStringList(p.getName()+"."+s+".advancements."+a.getKey().getKey()+".awarded");
 				org.bukkit.advancement.AdvancementProgress progress = p.getAdvancementProgress(a);
 				for(String adv : a.getCriteria()){
@@ -762,6 +770,7 @@ protected Location getLastLocationForWorld(Player p, LobbyWorld lw) {
 
 	protected void setLastLocationForWorld(Player p) {
 		LobbyWorld lw = LobbyAPI.getLobbyWorld(p.getWorld());
+		if(lw!=null)
 		if (lw.shouldWorldShouldSavePlayerLocation())
 			setLastLocationForWorld(p, lw, p.getLocation());
 	}
@@ -934,7 +943,9 @@ private void saveInventory(Player p, LobbyWorld lw) {
 		try{
 			config.set(p.getName()+"."+world2+".advancements",null);
 			Iterator<org.bukkit.advancement.Advancement> it = Bukkit.advancementIterator();
-			for(org.bukkit.advancement.Advancement a = it.next(); it.hasNext();it.next()){
+			for(org.bukkit.advancement.Advancement a = it.next(); it.hasNext(); a = it.next()){
+				if(a.getKey().getKey().startsWith("recipes"))
+					continue;
 				org.bukkit.advancement.AdvancementProgress pro = p.getAdvancementProgress(a);
 				config.set(p.getName()+"."+world2+".advancements."+a.getKey().getKey()+".awarded",new ArrayList<String>(pro.getAwardedCriteria()));
 			}