Merge pull request #28 from jaron780/master

Muggles
jrbudda · Dec 13, 2016 · 119c0c1 · 119c0c1
2 parents 59ed098 + 5ab2f2c
commit 119c0c1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/config.yml b/config.yml
@@ -30,4 +30,6 @@ permissions:
   #Permission group for vive users in free move mode.
   freemovegroup: vive.freemovegroup
 welcomemsg:
-  enabled: true
+  enabled: true
+  welcomeVR: Welcome, VR user!
+  welcomenonVR: Welcome, user!
diff --git a/src/org/vivecraft/listeners/VivecraftNetworkListener.java b/src/org/vivecraft/listeners/VivecraftNetworkListener.java
@@ -81,12 +81,12 @@ public void onPluginMessageReceived(String channel, Player sender, byte[] payloa
 					vivepl.setVR(false);
 
 					if(vse.getConfig().getBoolean("welcomemsg.enabled"))
-					ViveCommand.sendMessage("Welcome user!",sender);
+					ViveCommand.sendMessage(vse.getConfig().getString("welcomemsg.welcomenonVR"),sender);
 				}else{
 					vivepl.setVR(true);
 
 					if(vse.getConfig().getBoolean("welcomemsg.enabled"))
-					ViveCommand.sendMessage("Welcome VR user!",sender);
+					ViveCommand.sendMessage(vse.getConfig().getString("welcomemsg.welcomeVR"),sender);
 				}
 			} catch (IOException e) {
 				// TODO Auto-generated catch block