v2.10

EvolSoft · Aug 31, 2015 · 4ee90d8 · 4ee90d8
1 parent 25a3fd8
commit 4ee90d8
Show file tree

Hide file tree

Showing 15 changed files with 34 additions and 24 deletions.
diff --git a/ServerAuth/plugin.yml b/ServerAuth/plugin.yml
@@ -1,6 +1,6 @@
 name: ServerAuth
 main: ServerAuth\ServerAuth
-version: "2.00"
+version: "2.10"
 api: [1.11.0]
 load: STARTUP
 author: EvolSoft

diff --git a/ServerAuth/src/ServerAuth/Commands/ChangePassword.php b/ServerAuth/src/ServerAuth/Commands/ChangePassword.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * ServerAuth (v2.00) by EvolSoft
+ * ServerAuth (v2.10) by EvolSoft
  * Developer: EvolSoft (Flavius12)
  * Website: http://www.evolsoft.tk
  * Date: 31/08/2015 10:27 AM (UTC)

diff --git a/ServerAuth/src/ServerAuth/Commands/Commands.php b/ServerAuth/src/ServerAuth/Commands/Commands.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * ServerAuth (v2.00) by EvolSoft
+ * ServerAuth (v2.10) by EvolSoft
  * Developer: EvolSoft (Flavius12)
  * Website: http://www.evolsoft.tk
  * Date: 31/08/2015 10:31 AM (UTC)

diff --git a/ServerAuth/src/ServerAuth/Commands/Logout.php b/ServerAuth/src/ServerAuth/Commands/Logout.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * ServerAuth (v2.00) by EvolSoft
+ * ServerAuth (v2.10) by EvolSoft
  * Developer: EvolSoft (Flavius12)
  * Website: http://www.evolsoft.tk
  * Date: 31/08/2015 10:56 AM (UTC)

diff --git a/ServerAuth/src/ServerAuth/Commands/Register.php b/ServerAuth/src/ServerAuth/Commands/Register.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * ServerAuth (v2.00) by EvolSoft
+ * ServerAuth (v2.10) by EvolSoft
  * Developer: EvolSoft (Flavius12)
  * Website: http://www.evolsoft.tk
  * Date: 31/08/2015 11:03 AM (UTC)

diff --git a/ServerAuth/src/ServerAuth/Commands/Unregister.php b/ServerAuth/src/ServerAuth/Commands/Unregister.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * ServerAuth (v2.00) by EvolSoft
+ * ServerAuth (v2.10) by EvolSoft
  * Developer: EvolSoft (Flavius12)
  * Website: http://www.evolsoft.tk
  * Date: 31/08/2015 11:09 AM (UTC)

diff --git a/ServerAuth/src/ServerAuth/EventListener.php b/ServerAuth/src/ServerAuth/EventListener.php
@@ -1,10 +1,10 @@
 <?php
 
 /*
- * ServerAuth (v2.00) by EvolSoft
+ * ServerAuth (v2.10) by EvolSoft
  * Developer: EvolSoft (Flavius12)
  * Website: http://www.evolsoft.tk
- * Date: 31/08/2015 01:25 PM (UTC)
+ * Date: 31/08/2015 05:39 PM (UTC)
  * Copyright & License: (C) 2015 EvolSoft
  * Licensed under MIT (https://github.com/EvolSoft/ServerAuth/blob/master/LICENSE)
  */
@@ -33,6 +33,7 @@
 use pocketmine\Server;
 
 use ServerAuth\ServerAuth;
+use pocketmine\event\entity\EntityDamageByEntityEvent;
 
 class EventListener implements Listener {
 
@@ -54,10 +55,8 @@ public function onPreLogin(PlayerPreLoginEvent $event){
 				}
 			}
 			if($count > 1){
-				if(ServerAuth::getAPI()->isPlayerAuthenticated($player)){
-					$player->close($this->plugin->translateColors("&", ServerAuth::getAPI()->getConfigLanguage()->getAll()["single-auth"]), $this->plugin->translateColors("&", ServerAuth::getAPI()->getConfigLanguage()->getAll()["single-auth"]), false);
-					$event->setCancelled(true);
-				}
+				$player->close("", $this->plugin->translateColors("&", ServerAuth::getAPI()->getConfigLanguage()->getAll()["single-auth"]), $this->plugin->translateColors("&", ServerAuth::getAPI()->getConfigLanguage()->getAll()["single-auth"]), false);
+				$event->setCancelled(true);
 			}
 		}
 	}
@@ -169,8 +168,19 @@ public function onBucketEmpty(PlayerBucketEmptyEvent $event){
     }
     
     public function onEntityDamage(EntityDamageEvent $event){
-    	if(!ServerAuth::getAPI()->isPlayerRegistered($event->getPlayer()->getName()) || !ServerAuth::getAPI()->isPlayerAuthenticated($event->getPlayer())){
-    		$event->setCancelled(true);
+    		$player = $event->getEntity();
+    		if($player instanceof Player){
+    			if(!ServerAuth::getAPI()->isPlayerRegistered($player->getName()) || !ServerAuth::getAPI()->isPlayerAuthenticated($player)){
+    				$event->setCancelled(true);
+    			}
+    		}
+    	if($event instanceof EntityDamageByEntityEvent){
+    		$damager = $event->getDamager();
+    		if($damager instanceof Player){
+    			if(!ServerAuth::getAPI()->isPlayerRegistered($damager->getName()) || !ServerAuth::getAPI()->isPlayerAuthenticated($damager)){
+    				$event->setCancelled(true);
+    			}
+    		}
     	}
     }
     

diff --git a/ServerAuth/src/ServerAuth/Events/ServerAuthAuthenticateEvent.php b/ServerAuth/src/ServerAuth/Events/ServerAuthAuthenticateEvent.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * ServerAuth (v2.00) by EvolSoft
+ * ServerAuth (v2.10) by EvolSoft
  * Developer: EvolSoft (Flavius12)
  * Website: http://www.evolsoft.tk
  * Date: 10/05/2015 02:17 PM (UTC)

diff --git a/ServerAuth/src/ServerAuth/Events/ServerAuthDeauthenticateEvent.php b/ServerAuth/src/ServerAuth/Events/ServerAuthDeauthenticateEvent.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * ServerAuth (v2.00) by EvolSoft
+ * ServerAuth (v2.10) by EvolSoft
  * Developer: EvolSoft (Flavius12)
  * Website: http://www.evolsoft.tk
  * Date: 10/05/2015 02:19 PM (UTC)

diff --git a/ServerAuth/src/ServerAuth/Events/ServerAuthPasswordChangeEvent.php b/ServerAuth/src/ServerAuth/Events/ServerAuthPasswordChangeEvent.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * ServerAuth (v2.00) by EvolSoft
+ * ServerAuth (v2.10) by EvolSoft
  * Developer: EvolSoft (Flavius12)
  * Website: http://www.evolsoft.tk
  * Date: 10/05/2015 02:22 PM (UTC)

diff --git a/ServerAuth/src/ServerAuth/Events/ServerAuthRegisterEvent.php b/ServerAuth/src/ServerAuth/Events/ServerAuthRegisterEvent.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * ServerAuth (v2.00) by EvolSoft
+ * ServerAuth (v2.10) by EvolSoft
  * Developer: EvolSoft (Flavius12)
  * Website: http://www.evolsoft.tk
  * Date: 10/05/2015 02:22 PM (UTC)

diff --git a/ServerAuth/src/ServerAuth/Events/ServerAuthUnregisterEvent.php b/ServerAuth/src/ServerAuth/Events/ServerAuthUnregisterEvent.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * ServerAuth (v2.00) by EvolSoft
+ * ServerAuth (v2.10) by EvolSoft
  * Developer: EvolSoft (Flavius12)
  * Website: http://www.evolsoft.tk
  * Date: 31/08/2015 12:49 AM (UTC)

diff --git a/ServerAuth/src/ServerAuth/ServerAuth.php b/ServerAuth/src/ServerAuth/ServerAuth.php
@@ -1,10 +1,10 @@
 <?php
 
 /*
- * ServerAuth (v2.00) by EvolSoft
+ * ServerAuth (v2.10) by EvolSoft
  * Developer: EvolSoft (Flavius12)
  * Website: http://www.evolsoft.tk
- * Date: 31/08/2015 02:50 PM (UTC)
+ * Date: 31/08/2015 05:26 PM (UTC)
  * Copyright & License: (C) 2015 EvolSoft
  * Licensed under MIT (https://github.com/EvolSoft/ServerAuth/blob/master/LICENSE)
  */
@@ -28,7 +28,7 @@ class ServerAuth extends PluginBase {
 	const PRODUCER = "EvolSoft";
 
 	/** @var string VERSION Plugin version */
-	const VERSION = "2.00";
+	const VERSION = "2.10";
 
 	/** @var string MAIN_WEBSITE Plugin producer website */
 	const MAIN_WEBSITE = "http://www.evolsoft.tk";

diff --git a/ServerAuth/src/ServerAuth/Tasks/MessageTask.php b/ServerAuth/src/ServerAuth/Tasks/MessageTask.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * ServerAuth (v2.00) by EvolSoft
+ * ServerAuth (v2.10) by EvolSoft
  * Developer: EvolSoft (Flavius12)
  * Website: http://www.evolsoft.tk
  * Date: 30/08/2015 11:29 AM (UTC)

diff --git a/ServerAuth/src/ServerAuth/Tasks/MySQLTask.php b/ServerAuth/src/ServerAuth/Tasks/MySQLTask.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * ServerAuth (v2.00) by EvolSoft
+ * ServerAuth (v2.10) by EvolSoft
  * Developer: EvolSoft (Flavius12)
  * Website: http://www.evolsoft.tk
  * Date: 14/05/2015 05:19 PM (UTC)