From 6f2e4d5102ad74713b2761eb4c2913bcc39b61cf Mon Sep 17 00:00:00 2001
From: C2D03041 <c2d03041@protonmail.com>
Date: Sun, 7 Mar 2021 14:25:45 -0800
Subject: [PATCH] 1.1.6: Change communication protocol to make uuid switching
 less confusing for Paper

---
 .idea/workspace.xml                           | 90 ++++++++++++-------
 README.md                                     |  4 +-
 .../ProfilesPaperCoreMessageListener.java     |  7 --
 .../profiles/ProfilesPaperCoreModule.java     |  2 +-
 .../awooga/profiles/ProfilesPaperCoreSDK.java |  3 +-
 .../src/main/resources/plugin.yml             |  2 +-
 .../ProfilesPaperDisablerEventListener.java   |  2 +-
 .../src/main/resources/plugin.yml             |  2 +-
 .../com/awooga/profiles/ProfilesCommand2.java |  6 +-
 .../src/main/resources/plugin.yml             |  2 +-
 .../ProfilesWaterfallEventListener.java       | 23 ++---
 .../profiles/ProfilesWaterfallPlugin.java     |  5 ++
 .../com/awooga/profiles/UUIDSetterHelper.java | 13 ++-
 .../src/main/resources/plugin.yml             |  2 +-
 14 files changed, 99 insertions(+), 64 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d19a525..f66cdb9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -16,28 +16,17 @@
       <path>
         <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
         <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
-        <item name="GROUP_NODE:origin" type="e8cecc67:BranchNodeDescriptor" />
+        <item name="GROUP_NODE:origin-old" type="e8cecc67:BranchNodeDescriptor" />
       </path>
     </expand>
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="5f6b5723-1a9e-4b55-9ac6-234a284dab9f" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/dataSources.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/runConfigurations/ProfilesPlugin_build.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/sqldialects.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/modules/profiles-paper-core/profiles.profiles-paper-core.main.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/profiles-paper-core/profiles.profiles-paper-core.main.iml" afterDir="false" />
+    <list default="true" id="5f6b5723-1a9e-4b55-9ac6-234a284dab9f" name="Default Changelist" comment="1.1.6: Change communication protocol to make uuid switching less confusing for Paper">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/profiles-paper-core/src/main/resources/plugin.yml" beforeDir="false" afterPath="$PROJECT_DIR$/profiles-paper-core/src/main/resources/plugin.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/profiles-paper-disabler/src/main/resources/plugin.yml" beforeDir="false" afterPath="$PROJECT_DIR$/profiles-paper-disabler/src/main/resources/plugin.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/profiles-paper-gui/src/main/java/com/awooga/profiles/ProfilesCommand2.java" beforeDir="false" afterPath="$PROJECT_DIR$/profiles-paper-gui/src/main/java/com/awooga/profiles/ProfilesCommand2.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/profiles-paper-gui/src/main/java/com/awooga/profiles/util/HiddenStringUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/profiles-paper-gui/src/main/java/com/awooga/profiles/util/HiddenStringUtil.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/profiles-paper-gui/src/main/resources/config.yml" beforeDir="false" afterPath="$PROJECT_DIR$/profiles-paper-gui/src/main/resources/config.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/profiles-paper-gui/src/main/resources/plugin.yml" beforeDir="false" afterPath="$PROJECT_DIR$/profiles-paper-gui/src/main/resources/plugin.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/profiles-waterfall/src/main/java/com/awooga/profiles/ProfilesWaterfallEventListener.java" beforeDir="false" afterPath="$PROJECT_DIR$/profiles-waterfall/src/main/java/com/awooga/profiles/ProfilesWaterfallEventListener.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/profiles-waterfall/src/main/java/com/awooga/profiles/UUIDSetterHelper.java" beforeDir="false" afterPath="$PROJECT_DIR$/profiles-waterfall/src/main/java/com/awooga/profiles/UUIDSetterHelper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/profiles-waterfall/src/main/resources/plugin.yml" beforeDir="false" afterPath="$PROJECT_DIR$/profiles-waterfall/src/main/resources/plugin.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/profiles-paper-core/src/main/java/com/awooga/profiles/ProfilesPaperCoreMessageListener.java" beforeDir="false" afterPath="$PROJECT_DIR$/profiles-paper-core/src/main/java/com/awooga/profiles/ProfilesPaperCoreMessageListener.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/profiles-paper-core/src/main/java/com/awooga/profiles/ProfilesPaperCorePlugin.java" beforeDir="false" afterPath="$PROJECT_DIR$/profiles-paper-core/src/main/java/com/awooga/profiles/ProfilesPaperCorePlugin.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -205,7 +194,18 @@
       <command value="gradle init" />
     </option>
   </component>
-  <component name="RunManager" selected="Shell Script.Waterfall">
+  <component name="RunManager" selected="Gradle.minecraft-profiles-plugin [shadowJar]">
+    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
+      <option name="arquillianRunConfiguration">
+        <value>
+          <option name="containerStateName" value="" />
+        </value>
+      </option>
+      <option name="TEST_OBJECT" value="class" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration name="minecraft-profiles-plugin [jar]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
       <ExternalSystemSettings>
         <option name="executionName" />
@@ -445,7 +445,28 @@
       <option name="project" value="LOCAL" />
       <updated>1598637834131</updated>
     </task>
-    <option name="localTasksCounter" value="9" />
+    <task id="LOCAL-00009" summary="1.1.5: small bugfix with sending the uuid">
+      <created>1615071261264</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1615071261264</updated>
+    </task>
+    <task id="LOCAL-00010" summary="Add Readme and licenses">
+      <created>1615072174207</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1615072174207</updated>
+    </task>
+    <task id="LOCAL-00011" summary="1.1.6: Change communication protocol to make uuid switching less confusing for Paper">
+      <created>1615155945288</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1615155945288</updated>
+    </task>
+    <option name="localTasksCounter" value="12" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -507,7 +528,10 @@
     <MESSAGE value="1.0.6 and 7 - Custom materials for inventory items, and disable mojang profile flag" />
     <MESSAGE value="1.0.9 and 1.0.10: disabler plugin, fixing viaversion support" />
     <MESSAGE value="1.1.0: `options.preferCachedPlaceholders`" />
-    <option name="LAST_COMMIT_MESSAGE" value="1.1.0: `options.preferCachedPlaceholders`" />
+    <MESSAGE value="1.1.5: small bugfix with sending the uuid" />
+    <MESSAGE value="Add Readme and licenses" />
+    <MESSAGE value="1.1.6: Change communication protocol to make uuid switching less confusing for Paper" />
+    <option name="LAST_COMMIT_MESSAGE" value="1.1.6: Change communication protocol to make uuid switching less confusing for Paper" />
   </component>
   <component name="WindowStateProjectService">
     <state x="529" y="415" key="#SQL_Resolution_Scopes" timestamp="1615063149263">
@@ -522,25 +546,25 @@
       <screen x="0" y="0" width="2560" height="1050" />
     </state>
     <state x="868" y="314" key="FileChooserDialogImpl/0.0.2560.1050/-1440.54.1440.870/2560.-83.1280.994@0.0.2560.1050" timestamp="1615064444089" />
-    <state width="1981" height="229" key="GridCell.Tab.0.bottom" timestamp="1615065550521">
+    <state width="1981" height="170" key="GridCell.Tab.0.bottom" timestamp="1615156050752">
       <screen x="0" y="0" width="2560" height="1050" />
     </state>
-    <state width="1981" height="229" key="GridCell.Tab.0.bottom/0.0.2560.1050/-1440.54.1440.870/2560.-83.1280.994@0.0.2560.1050" timestamp="1615065550521" />
+    <state width="1981" height="170" key="GridCell.Tab.0.bottom/0.0.2560.1050/-1440.54.1440.870/2560.-83.1280.994@0.0.2560.1050" timestamp="1615156050752" />
     <state width="1776" height="229" key="GridCell.Tab.0.bottom/0.0.2560.1050/2560.167.1440.870/-1280.-13.1280.994@0.0.2560.1050" timestamp="1609134422433" />
-    <state width="1981" height="229" key="GridCell.Tab.0.center" timestamp="1615065550521">
+    <state width="1981" height="170" key="GridCell.Tab.0.center" timestamp="1615156050751">
       <screen x="0" y="0" width="2560" height="1050" />
     </state>
-    <state width="1981" height="229" key="GridCell.Tab.0.center/0.0.2560.1050/-1440.54.1440.870/2560.-83.1280.994@0.0.2560.1050" timestamp="1615065550521" />
+    <state width="1981" height="170" key="GridCell.Tab.0.center/0.0.2560.1050/-1440.54.1440.870/2560.-83.1280.994@0.0.2560.1050" timestamp="1615156050751" />
     <state width="1776" height="229" key="GridCell.Tab.0.center/0.0.2560.1050/2560.167.1440.870/-1280.-13.1280.994@0.0.2560.1050" timestamp="1609134422433" />
-    <state width="1981" height="229" key="GridCell.Tab.0.left" timestamp="1615065550520">
+    <state width="1981" height="170" key="GridCell.Tab.0.left" timestamp="1615156050751">
       <screen x="0" y="0" width="2560" height="1050" />
     </state>
-    <state width="1981" height="229" key="GridCell.Tab.0.left/0.0.2560.1050/-1440.54.1440.870/2560.-83.1280.994@0.0.2560.1050" timestamp="1615065550520" />
+    <state width="1981" height="170" key="GridCell.Tab.0.left/0.0.2560.1050/-1440.54.1440.870/2560.-83.1280.994@0.0.2560.1050" timestamp="1615156050751" />
     <state width="1776" height="229" key="GridCell.Tab.0.left/0.0.2560.1050/2560.167.1440.870/-1280.-13.1280.994@0.0.2560.1050" timestamp="1609134422433" />
-    <state width="1981" height="229" key="GridCell.Tab.0.right" timestamp="1615065550521">
+    <state width="1981" height="170" key="GridCell.Tab.0.right" timestamp="1615156050751">
       <screen x="0" y="0" width="2560" height="1050" />
     </state>
-    <state width="1981" height="229" key="GridCell.Tab.0.right/0.0.2560.1050/-1440.54.1440.870/2560.-83.1280.994@0.0.2560.1050" timestamp="1615065550521" />
+    <state width="1981" height="170" key="GridCell.Tab.0.right/0.0.2560.1050/-1440.54.1440.870/2560.-83.1280.994@0.0.2560.1050" timestamp="1615156050751" />
     <state width="1776" height="229" key="GridCell.Tab.0.right/0.0.2560.1050/2560.167.1440.870/-1280.-13.1280.994@0.0.2560.1050" timestamp="1609134422433" />
     <state x="1125" y="267" key="RollbackChangesDialog" timestamp="1609123276347">
       <screen x="0" y="0" width="2560" height="1050" />
@@ -558,6 +582,10 @@
       <screen x="0" y="0" width="2560" height="1050" />
     </state>
     <state x="704" y="192" width="1636" height="710" key="VCS.FileHistoryDialog/0.0.2560.1050/2560.167.1440.870/-1280.-13.1280.994@0.0.2560.1050" timestamp="1609125448056" />
+    <state x="922" y="289" key="Vcs.Push.Dialog.v2" timestamp="1615156016740">
+      <screen x="0" y="0" width="2560" height="1050" />
+    </state>
+    <state x="922" y="289" key="Vcs.Push.Dialog.v2/0.0.2560.1050/-1440.54.1440.870/2560.-83.1280.994@0.0.2560.1050" timestamp="1615156016740" />
     <state x="987" y="459" key="com.intellij.database.run.ParametersPanel.Standalone" timestamp="1615063170799">
       <screen x="0" y="0" width="2560" height="1050" />
     </state>
@@ -566,15 +594,15 @@
       <screen x="0" y="0" width="2560" height="1050" />
     </state>
     <state x="944" y="126" key="com.intellij.database.view.ui.AbstractDbRefactoringDialog/0.0.2560.1050/-1440.54.1440.870/2560.-83.1280.994@0.0.2560.1050" timestamp="1615063101634" />
-    <state x="1091" y="64" width="1270" height="986" key="find.popup" timestamp="1615064200432">
+    <state x="1091" y="64" width="1270" height="986" key="find.popup" timestamp="1615154378232">
       <screen x="0" y="0" width="2560" height="1050" />
     </state>
-    <state x="1091" y="64" width="1270" height="986" key="find.popup/0.0.2560.1050/-1440.54.1440.870/2560.-83.1280.994@0.0.2560.1050" timestamp="1615064200432" />
+    <state x="1091" y="64" width="1270" height="986" key="find.popup/0.0.2560.1050/-1440.54.1440.870/2560.-83.1280.994@0.0.2560.1050" timestamp="1615154378232" />
     <state x="1091" y="64" width="1270" height="986" key="find.popup/0.0.2560.1050/2560.167.1440.870/-1280.-13.1280.994@0.0.2560.1050" timestamp="1609131596082" />
-    <state x="450" y="243" width="1344" height="686" key="search.everywhere.popup" timestamp="1615062639406">
+    <state x="450" y="243" width="1344" height="686" key="search.everywhere.popup" timestamp="1615070122135">
       <screen x="0" y="0" width="2560" height="1050" />
     </state>
-    <state x="450" y="243" width="1344" height="686" key="search.everywhere.popup/0.0.2560.1050/-1440.54.1440.870/2560.-83.1280.994@0.0.2560.1050" timestamp="1615062639406" />
+    <state x="450" y="243" width="1344" height="686" key="search.everywhere.popup/0.0.2560.1050/-1440.54.1440.870/2560.-83.1280.994@0.0.2560.1050" timestamp="1615070122135" />
     <state x="450" y="243" width="1344" height="686" key="search.everywhere.popup/0.0.2560.1050/2560.167.1440.870/-1280.-13.1280.994@0.0.2560.1050" timestamp="1609123255609" />
   </component>
 </project>
\ No newline at end of file
diff --git a/README.md b/README.md
index 9cec24f..420890b 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Plugin for Paper/Spigot and Waterfall/Bungeecord that adds player profile slots/
 License
 ---
 
-`profiles-paper-gui`, `profiles-paper-core`, and `profiles-paper-disabler` are distributed under GNU GPL v3
+`profiles-paper-gui`, `profiles-paper-core`, and `profiles-paper-disabler` are licensed under GNU GPL v3
 
-`profiles-waterfall` is dual licensed under either GNU GPL v3 or MIT.
+`profiles-waterfall` and all other project files are dual licensed under either GNU GPL v3 or MIT.
 
diff --git a/profiles-paper-core/src/main/java/com/awooga/profiles/ProfilesPaperCoreMessageListener.java b/profiles-paper-core/src/main/java/com/awooga/profiles/ProfilesPaperCoreMessageListener.java
index 57f93ba..3bc1353 100644
--- a/profiles-paper-core/src/main/java/com/awooga/profiles/ProfilesPaperCoreMessageListener.java
+++ b/profiles-paper-core/src/main/java/com/awooga/profiles/ProfilesPaperCoreMessageListener.java
@@ -19,8 +19,6 @@ public class ProfilesPaperCoreMessageListener implements PluginMessageListener,
 	@Inject
 	ProfilesPaperCorePlugin plugin;
 
-	HashSet<Player> suppressDuplicates = new HashSet<>();
-
 	@Override
 	public void onPluginMessageReceived(String channel, Player player, byte[] message) {
 		//System.out.println("Got message from player uuid channel - "+channel+" - "+player);
@@ -67,9 +65,4 @@ public void onPluginMessageReceived(String channel, Player player, byte[] messag
 			Bukkit.getServer().getPluginManager().callEvent(event);
 		}
 	}
-
-	@EventHandler
-	public void onPlayerDisconnectEvent(PlayerQuitEvent ev) {
-		suppressDuplicates.remove(ev.getPlayer());
-	}
 }
diff --git a/profiles-paper-core/src/main/java/com/awooga/profiles/ProfilesPaperCoreModule.java b/profiles-paper-core/src/main/java/com/awooga/profiles/ProfilesPaperCoreModule.java
index 498205e..db7ea6a 100644
--- a/profiles-paper-core/src/main/java/com/awooga/profiles/ProfilesPaperCoreModule.java
+++ b/profiles-paper-core/src/main/java/com/awooga/profiles/ProfilesPaperCoreModule.java
@@ -22,7 +22,7 @@ public Injector createInjector() {
 	protected void configure() {
 		// Here we tell Guice to use our plugin instance everytime we need it
 		this.bind(ProfilesPaperCorePlugin.class).toInstance(this.plugin);
-		bind(ProfilesPaperCoreMessageListener.class);
+		bind(ProfilesPaperCoreMessageListener.class).in(Singleton.class);
 		bind(ProfilesPaperCoreSDK.class).in(Singleton.class);
 	}
 }
\ No newline at end of file
diff --git a/profiles-paper-core/src/main/java/com/awooga/profiles/ProfilesPaperCoreSDK.java b/profiles-paper-core/src/main/java/com/awooga/profiles/ProfilesPaperCoreSDK.java
index c8a36f8..844ba53 100644
--- a/profiles-paper-core/src/main/java/com/awooga/profiles/ProfilesPaperCoreSDK.java
+++ b/profiles-paper-core/src/main/java/com/awooga/profiles/ProfilesPaperCoreSDK.java
@@ -25,10 +25,9 @@ public static ProfilesPaperCoreSDK getInstance() {
 		return plugin.sdk;
 	}
 
-	public boolean switchPlayerToProfile(Player player, UUID genuineUuid, UUID profileUuid) {
+	public boolean switchPlayerToProfile(Player player, UUID profileUuid) {
 		ByteArrayDataOutput out = ByteStreams.newDataOutput();
 		out.writeUTF( ProfilesConstants.SWITCH_PLAYER_TO_NEW_PROFILE );
-		out.writeUTF( genuineUuid.toString() );
 		out.writeUTF( profileUuid.toString() );
 		player.sendPluginMessage( plugin, ProfilesConstants.BUNGEE_CHANNEL_NAME_FOR_REQUESTS, out.toByteArray() ); // Send to Bungee
 		return true;
diff --git a/profiles-paper-core/src/main/resources/plugin.yml b/profiles-paper-core/src/main/resources/plugin.yml
index 5834f68..a4b60a6 100644
--- a/profiles-paper-core/src/main/resources/plugin.yml
+++ b/profiles-paper-core/src/main/resources/plugin.yml
@@ -1,4 +1,4 @@
 name: ProfilesPaperCore
-version: 1.1.4
+version: 1.1.6
 main: com.awooga.profiles.ProfilesPaperCorePlugin
 api-version: 1.13
diff --git a/profiles-paper-disabler/src/main/java/com/awooga/profiles/ProfilesPaperDisablerEventListener.java b/profiles-paper-disabler/src/main/java/com/awooga/profiles/ProfilesPaperDisablerEventListener.java
index cb8e72e..01bb19c 100644
--- a/profiles-paper-disabler/src/main/java/com/awooga/profiles/ProfilesPaperDisablerEventListener.java
+++ b/profiles-paper-disabler/src/main/java/com/awooga/profiles/ProfilesPaperDisablerEventListener.java
@@ -14,7 +14,7 @@ public class ProfilesPaperDisablerEventListener implements Listener {
 	public void onUUIDOverrideEvent(PlayerUUIDOverrideEvent ev) {
 		if(!ev.getCurrentUuid().equals(ev.getOriginalUuid())) {
 			System.out.println("Got PlayerUUIDOverrideEvent for "+ev.getPlayer().getDisplayName()+" - reconnecting the user on their genuine profile");
-			sdk.switchPlayerToProfile(ev.getPlayer(), ev.getOriginalUuid(), ev.getOriginalUuid());
+			sdk.switchPlayerToProfile(ev.getPlayer(), ev.getOriginalUuid());
 		}
 
 	}
diff --git a/profiles-paper-disabler/src/main/resources/plugin.yml b/profiles-paper-disabler/src/main/resources/plugin.yml
index 3716efb..8193eaf 100644
--- a/profiles-paper-disabler/src/main/resources/plugin.yml
+++ b/profiles-paper-disabler/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: ProfilesPaperDisabler
-version: 1.1.4
+version: 1.1.6
 main: com.awooga.profiles.ProfilesPaperDisablerPlugin
 api-version: 1.13
 depend: [ProfilesPaperCore]
\ No newline at end of file
diff --git a/profiles-paper-gui/src/main/java/com/awooga/profiles/ProfilesCommand2.java b/profiles-paper-gui/src/main/java/com/awooga/profiles/ProfilesCommand2.java
index 1765803..4bdac49 100644
--- a/profiles-paper-gui/src/main/java/com/awooga/profiles/ProfilesCommand2.java
+++ b/profiles-paper-gui/src/main/java/com/awooga/profiles/ProfilesCommand2.java
@@ -169,8 +169,8 @@ public class ProfilesCommand2 extends BukkitEventFSM<ProfilesCommandState> imple
 					return s;
 				}
 
-				UUID genuineUuid = playerProfilesDAO.getGenuineUUID(player);
-				profilesPaperCoreSDK.switchPlayerToProfile(player, genuineUuid, targetUuid);
+				//UUID genuineUuid = playerProfilesDAO.getGenuineUUID(player);
+				profilesPaperCoreSDK.switchPlayerToProfile(player, targetUuid);
 
 				return s;
 			})
@@ -294,7 +294,7 @@ public class ProfilesCommand2 extends BukkitEventFSM<ProfilesCommandState> imple
 			UUID newUuid = playerProfilesDAO.createNewProfile(player);
 			playerProfilesDAO.addBrandNewProfileId(newUuid);
 			UUID genuineUuid = playerProfilesDAO.getGenuineUUID(player);
-			profilesPaperCoreSDK.switchPlayerToProfile(player, genuineUuid, newUuid);
+			profilesPaperCoreSDK.switchPlayerToProfile(player, newUuid);
 			return Triplet.with(true, targetUuid, null);
 		}
 
diff --git a/profiles-paper-gui/src/main/resources/plugin.yml b/profiles-paper-gui/src/main/resources/plugin.yml
index 3795781..f4e97cc 100644
--- a/profiles-paper-gui/src/main/resources/plugin.yml
+++ b/profiles-paper-gui/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: ProfilesPaperGui
-version: 1.1.4
+version: 1.1.6
 main: com.awooga.profiles.ProfilesPaperGuiPlugin
 api-version: 1.13
 depend: [PlaceholderAPI, ProfilesPaperCore]
diff --git a/profiles-waterfall/src/main/java/com/awooga/profiles/ProfilesWaterfallEventListener.java b/profiles-waterfall/src/main/java/com/awooga/profiles/ProfilesWaterfallEventListener.java
index 85d267e..24a355e 100644
--- a/profiles-waterfall/src/main/java/com/awooga/profiles/ProfilesWaterfallEventListener.java
+++ b/profiles-waterfall/src/main/java/com/awooga/profiles/ProfilesWaterfallEventListener.java
@@ -51,6 +51,11 @@ public void onLogin(LoginEvent ev) {
         */
     }
 
+    @EventHandler
+    public void onServerConnected(ServerConnectEvent ev) {
+        //uuidSetterHelper.notifyServerOfUuidOverride(ev.getPlayer());
+    }
+
     @EventHandler
     public void onServerConnected(ServerSwitchEvent ev) {
         ProxiedPlayer player = ev.getPlayer();
@@ -78,7 +83,7 @@ public void onServerConnected(ServerSwitchEvent ev) {
     @SneakyThrows
     @EventHandler
     public void onPluginMessage(PluginMessageEvent event) {
-        //System.out.println("Got plugin message event: "+event+" - "+event.getTag());
+        System.out.println("Got plugin message event: "+event+" - "+event.getTag());
         if (
             !event.getTag().equals(ProfilesConstants.BUNGEE_CHANNEL_NAME_FOR_REQUESTS) &&
             !event.getTag().equals(ProfilesConstants.BUNGEE_CHANNEL_NAME_FOR_REQUESTS.substring(0, ProfilesConstants.BUNGEE_CHANNEL_NAME_FOR_REQUESTS.length() - 1))
@@ -93,25 +98,21 @@ public void onPluginMessage(PluginMessageEvent event) {
             ProfilesConstants.SWITCH_PLAYER_TO_NEW_PROFILE.equals(channel) ||
             ProfilesConstants.SWITCH_PLAYER_TO_NEW_PROFILE.substring(0, ProfilesConstants.SWITCH_PLAYER_TO_NEW_PROFILE.length() - 1).equals(channel)
         ) {
-            String genuineUuidString = in.readUTF();
             String profileUuidString = in.readUTF();
-            //System.out.println("Got genuine UUID string: "+genuineUuidString);
-            //System.out.println("Got profile UUID string: "+profileUuidString);
-            UUID genuineUuid = UUID.fromString(genuineUuidString);
             UUID profileUuid = UUID.fromString(profileUuidString);
-            //System.out.println("Got genuine UUID string: "+genuineUuid);
             //System.out.println("Got profile UUID string: "+profileUuid);
+            /*
             String onlinePlayers = ProxyServer.getInstance().getPlayers().stream()
                 .map(p -> p.getUniqueId()+" - "+p.getDisplayName())
                 .collect(Collectors.joining(","));
             System.out.println("Got online players: " + onlinePlayers);
             ProxiedPlayer player = ProxyServer.getInstance().getPlayer(genuineUuid);
+             */
+            if(!(event.getReceiver() instanceof ProxiedPlayer)) {
+                System.out.println("Cannot process profile switch event -- socket is not a player instance");
+            }
+            ProxiedPlayer player = (ProxiedPlayer) event.getReceiver();
 
-            player = player != null ? player : ProxyServer.getInstance().getPlayers().stream()
-                .filter(p -> p.getUniqueId().equals(genuineUuid) || p.getUniqueId().equals(profileUuid))
-                .findAny()
-                .orElse(null)
-            ;
             if(player == null) {
                 throw new Exception("SWITCH_PLAYER_TO_NEW_PROFILE command got a uuid that doesn't refer to an online player");
             }
diff --git a/profiles-waterfall/src/main/java/com/awooga/profiles/ProfilesWaterfallPlugin.java b/profiles-waterfall/src/main/java/com/awooga/profiles/ProfilesWaterfallPlugin.java
index e1e7ea0..0e8b109 100644
--- a/profiles-waterfall/src/main/java/com/awooga/profiles/ProfilesWaterfallPlugin.java
+++ b/profiles-waterfall/src/main/java/com/awooga/profiles/ProfilesWaterfallPlugin.java
@@ -3,6 +3,7 @@
 import com.google.inject.Injector;
 import net.md_5.bungee.api.plugin.Plugin;
 import net.md_5.bungee.api.plugin.PluginManager;
+import net.md_5.bungee.api.scheduler.TaskScheduler;
 
 import javax.inject.Inject;
 
@@ -29,6 +30,10 @@ public void onEnable() {
         manager.registerCommand(this, setUUIDCommand);
     }
 
+    public TaskScheduler getScheduler() {
+        return this.getProxy().getScheduler();
+    }
+
     @Override
     public void onDisable() {
         // Plugin shutdown logic
diff --git a/profiles-waterfall/src/main/java/com/awooga/profiles/UUIDSetterHelper.java b/profiles-waterfall/src/main/java/com/awooga/profiles/UUIDSetterHelper.java
index fd0d041..a66813f 100644
--- a/profiles-waterfall/src/main/java/com/awooga/profiles/UUIDSetterHelper.java
+++ b/profiles-waterfall/src/main/java/com/awooga/profiles/UUIDSetterHelper.java
@@ -17,11 +17,15 @@
 import java.io.StringWriter;
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 
 public class UUIDSetterHelper {
 	@Inject
 	ProfileDAO profileDao;
 
+	@Inject
+	ProfilesWaterfallPlugin plugin;
+
 	public void setUuid(ProxiedPlayer player, UUID newUuid) {
 		//PendingConnection conn = ev.getConnection();
 		PendingConnection conn = player.getPendingConnection();
@@ -103,7 +107,7 @@ public void notifyServerOfUuidOverride(ProxiedPlayer player) {
 			return;
 		}
 
-		//System.out.println("Notify stack trace: ");
+		System.out.println("Sending PlayerUUIDOverrideEvent "+player.getDisplayName()+" - mojangUuid: "+originalUuid+" profileUuid: "+currentUuid);
 		//new Exception().printStackTrace();
 
 		// we should always send a uuid override event, even for non-overriden users
@@ -114,7 +118,12 @@ public void notifyServerOfUuidOverride(ProxiedPlayer player) {
 			out.writeUTF("PlayerUUIDOverrideEvent");
 			out.writeUTF(originalUuid.get().toString());
 			out.writeUTF(currentUuid.toString());
-			player.getServer().getInfo().sendData(ProfilesConstants.BUNGEE_CHANNEL_NAME_FOR_NOTIFICATIONS, out.toByteArray());
+			//player.getServer().getInfo().sendData(ProfilesConstants.BUNGEE_CHANNEL_NAME_FOR_NOTIFICATIONS, out.toByteArray());
+
+			//plugin.getScheduler().schedule(this.plugin, () -> {
+			//	System.out.println("SCHEDULE RUNNING");
+				player.getServer().sendData(ProfilesConstants.BUNGEE_CHANNEL_NAME_FOR_NOTIFICATIONS, out.toByteArray());
+			//}, 1, TimeUnit.SECONDS);
 		//}
 	}
 }
diff --git a/profiles-waterfall/src/main/resources/plugin.yml b/profiles-waterfall/src/main/resources/plugin.yml
index bb8fd2c..bd71c46 100644
--- a/profiles-waterfall/src/main/resources/plugin.yml
+++ b/profiles-waterfall/src/main/resources/plugin.yml
@@ -1,3 +1,3 @@
 name: ProfilesWaterfall
-version: 1.1.4
+version: 1.1.6
 main: com.awooga.profiles.ProfilesWaterfallPlugin