Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex

Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java

@@ -87,8 +87,8 @@ public enum Achievement
 	//Skywars
 	SKYWARS_WINS("Sky King",2000,
 			new String[]{"Skywars.Wins"},
-			new String[]{"Win 50 Games of Skywars"},
-			new int[]{50},
+			new String[]{"Win 30 Games of Skywars"},
+			new int[]{30},
 			AchievementCategory.SKYWARS),
 			
 	SKYWARS_BOMBER("Master Bomber",500,
@@ -111,8 +111,8 @@ public enum Achievement
 			
 	SKYWARS_PLAYER_KILLS("Cold Blooded Killer",500,
 			new String[]{"Skywars.Kills"},
-			new String[]{"Kill 250 Players"},
-			new int[]{250},
+			new String[]{"Kill 80 Players"},
+			new int[]{80},
 			AchievementCategory.SKYWARS),
 			
 	SKYWARS_NOCHEST("Survivalist",1000,

Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitManager.java

@@ -29,8 +29,9 @@ public class BenefitManager extends MiniDbClientPlugin<BenefitData>
 
 		_repository = new BenefitManagerRepository(plugin); 
 		
-		_benefits.add(new Christmas2014(plugin, _repository, inventoryManager));
+		//_benefits.add(new Christmas2014(plugin, _repository, inventoryManager));
 		//_benefits.add(new Thanksgiving2014(plugin, _repository, inventoryManager));
+		_benefits.add(new Players40k(plugin, _repository, inventoryManager));
 	}
 	
 	@EventHandler(priority = EventPriority.LOWEST)

Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java

@@ -60,7 +60,7 @@ public enum GameDisplay
 
 	Build("Master Builders", Material.WOOD, (byte)0, GameCategory.CLASSICS, 50),
 	Cards("Craft Against Humanity", Material.MAP, (byte)0, GameCategory.CLASSICS, 51),
-	Skywars("Skywars", Material.DOUBLE_PLANT, (byte)5, GameCategory.SURVIVAL, 52),
+	Skywars("Skywars", Material.FEATHER, (byte)5, GameCategory.SURVIVAL, 52),
 
 	Event("Mineplex Event", Material.CAKE, (byte)0, GameCategory.EVENT, 999);
 

Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java

@@ -47,6 +47,7 @@ import mineplex.core.account.CoreClient;
 import mineplex.core.account.CoreClientManager;
 import mineplex.core.achievement.AchievementManager;
 import mineplex.core.aprilfools.AprilFoolsManager;
+import mineplex.core.benefit.BenefitManager;
 import mineplex.core.blockrestore.BlockRestore;
 import mineplex.core.common.Rank;
 import mineplex.core.common.util.C;
@@ -176,7 +177,7 @@ public class HubManager extends MiniClientPlugin<HubClient>
 
 		_mountManager = new MountManager(_plugin, clientManager, donationManager, blockRestore, _disguiseManager);
 		_inventoryManager = new InventoryManager(plugin, clientManager);
-		//new BenefitManager(plugin, clientManager, _inventoryManager);
+		new BenefitManager(plugin, clientManager, _inventoryManager);
 		_gadgetManager = new GadgetManager(_plugin, clientManager, donationManager, _inventoryManager, _mountManager, petManager, preferences, disguiseManager, blockRestore, new ProjectileManager(plugin));
 		_treasureManager = new TreasureManager(_plugin, clientManager, donationManager, _inventoryManager, petManager, _blockRestore, hologramManager);
 		new CosmeticManager(_plugin, clientManager, donationManager, _inventoryManager, _gadgetManager, _mountManager, petManager, _treasureManager);

Plugins/Mineplex.Hub/src/mineplex/hub/modules/StackerManager.java

@@ -57,6 +57,22 @@ public class StackerManager extends MiniPlugin implements IThrown
 		if (event.isCancelled())
 			return;
 
+		Entity stackee = event.getRightClicked();
+		if (stackee == null)
+			return;
+
+		if (!(stackee instanceof LivingEntity))
+			return;
+		
+		if (stackee instanceof Horse)
+			return;
+		
+		if (stackee instanceof EnderDragon)
+			return;
+
+		if (stackee instanceof Player && ((Player)stackee).getGameMode() != GameMode.SURVIVAL)
+			return;
+		
 		Player stacker = event.getPlayer();
 
 		if (stacker.getGameMode() != GameMode.SURVIVAL)
@@ -89,22 +105,6 @@ public class StackerManager extends MiniPlugin implements IThrown
 			return;
 		}
 
-		Entity stackee = event.getRightClicked();
-		if (stackee == null)
-			return;
-
-		if (!(stackee instanceof LivingEntity))
-			return;
-
-		if (stackee instanceof Horse)
-			return;
-		
-		if (stackee instanceof EnderDragon)
-			return;
-
-		if (stackee instanceof Player && ((Player)stackee).getGameMode() != GameMode.SURVIVAL)
-			return;
-		
 		stackerEvent = new StackerEvent(stackee);		
 		Bukkit.getServer().getPluginManager().callEvent(stackerEvent);
 		if (stackerEvent.isCancelled())

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/DisguiseCommand.java

@@ -18,7 +18,7 @@ public class DisguiseCommand extends CommandBase<ArcadeManager>
 {
 	public DisguiseCommand(ArcadeManager plugin)
 	{
-		super(plugin, Rank.YOUTUBE, new Rank[] {Rank.YOUTUBE}, "disguise");
+		super(plugin, Rank.ADMIN, new Rank[] {Rank.YOUTUBE, Rank.TWITCH}, "disguise");
 	}
 
 	@Override

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java

@@ -260,7 +260,8 @@ public class Skywars extends SoloGame
 			zombie.setRemoveWhenFarAway(false);
 			zombie.setCustomName(C.cDRed + "Zombie Guardian");
 			zombie.setCustomNameVisible(true);
-			zombie.setMaxHealth(20.0D);
+			zombie.setMaxHealth(15);
+			zombie.setHealth(15);
 			CreatureAllowOverride = false;
 			
 			// Armor - Make sure the player can't get it!
@@ -415,7 +416,7 @@ public class Skywars extends SoloGame
 			setAlreadyAnnounced(true);
 		}
 
-		for (int i = 0; i < 5; i++)
+		for (int i = 0; i < 4; i++)
 		{
 			Block bestBlock = null;
 			double bestDist = 0.0D;
@@ -619,7 +620,7 @@ public class Skywars extends SoloGame
 				validChest.setTypeIdAndData(Material.CHEST.getId(),
 						(byte) UtilMath.r(4), false);
 
-				_worldBlocks.add(block);
+				_worldBlocks.add(validChest);
 
 				done++;
 			}
@@ -1117,8 +1118,8 @@ public class Skywars extends SoloGame
 		
 		//Projectile
 		_playerProjectile.addLoot(new RandomItem(Material.ARROW, 18, 2, 8));
-		_playerProjectile.addLoot(new RandomItem(Material.SNOW_BALL, 60, 2, 8));
-		_playerProjectile.addLoot(new RandomItem(Material.EGG, 60, 2, 8));
+		_playerProjectile.addLoot(new RandomItem(Material.SNOW_BALL, 60, 2, 5));
+		_playerProjectile.addLoot(new RandomItem(Material.EGG, 60, 2, 5));
 		
 		//Block
 		_playerBlock.addLoot(new RandomItem(Material.COBBLESTONE, 30, 8, 16));

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/data/TNTGenerator.java

@@ -122,7 +122,7 @@ public class TNTGenerator
 						2,
 						F.item(C.cYellow + C.Bold + "Left Click - Far "
 								+ C.cWhite + " / " + C.cYellow + C.Bold
-								+ " Right Click - Short")));
+								+ " Right Click - Drop")));
 
 		player.playSound(player.getLocation(), Sound.ENDERDRAGON_HIT, 3F, 1F);
 		

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkMadScientist.java

@@ -9,6 +9,7 @@ import mineplex.core.common.util.UtilEnt;
 import mineplex.core.common.util.UtilInv;
 import mineplex.core.common.util.UtilMath;
 import mineplex.core.common.util.UtilParticle;
+import mineplex.core.common.util.UtilTime;
 import mineplex.core.common.util.UtilParticle.ParticleType;
 import mineplex.core.common.util.UtilParticle.ViewDist;
 import mineplex.core.common.util.UtilServer;
@@ -68,6 +69,9 @@ public class PerkMadScientist extends Perk implements IThrown
 
 		if (Manager.GetGame() == null)
 			return;
+		
+		if (!UtilTime.elapsed(Manager.GetGame().GetStateTime(), 60000))
+			return;
 
 		for (Player player : Manager.GetGame().GetPlayers(true))
 		{
@@ -226,47 +230,48 @@ public class PerkMadScientist extends Perk implements IThrown
 		
 		//Name
 		zombie.setCustomName(C.cAqua + UtilEnt.getName(data.GetThrower()) + "'s Minion");
+		zombie.setCustomNameVisible(true);
 		
-		double r = Math.random();
-		
-		DisguiseBase disguise;
-		if (r > 0.8)
-		{
-			disguise = new DisguiseZombie(zombie);
-		}
-		else if (r > 0.6)
-		{
-			disguise = new DisguiseBlaze(zombie);
-		}
-		else if (r > 0.4)
-		{
-			disguise = new DisguiseSpider(zombie);
-		}
-		else if (r > 0.2)
-		{
-			disguise = new DisguiseSkeleton(zombie);
-		}
-		else 
-		{
-			disguise = new DisguiseSlime(zombie);
-			((DisguiseSlime)disguise).SetSize(2);
-		}
-		
-		if (disguise instanceof DisguiseInsentient)
-		{
-			if (((Player) data.GetThrower()).getName().toLowerCase().endsWith("s"))
-			{
-				((DisguiseInsentient)disguise).setName(C.cAqua + UtilEnt.getName(data.GetThrower()) + "' Minion");
-			}
-			else
-			{
-				((DisguiseInsentient)disguise).setName(C.cAqua + UtilEnt.getName(data.GetThrower()) + "' Minion");
-			}
-
-			((DisguiseInsentient)disguise).setCustomNameVisible(true);
-		}
-
-		Manager.GetDisguise().disguise(disguise);
+//		double r = Math.random();
+//		
+//		DisguiseBase disguise;
+//		if (r > 0.8)
+//		{
+//			disguise = new DisguiseZombie(zombie);
+//		}
+//		else if (r > 0.6)
+//		{
+//			disguise = new DisguiseBlaze(zombie);
+//		}
+//		else if (r > 0.4)
+//		{
+//			disguise = new DisguiseSpider(zombie);
+//		}
+//		else if (r > 0.2)
+//		{
+//			disguise = new DisguiseSkeleton(zombie);
+//		}
+//		else 
+//		{
+//			disguise = new DisguiseSlime(zombie);
+//			((DisguiseSlime)disguise).SetSize(2);
+//		}
+//		
+//		if (disguise instanceof DisguiseInsentient)
+//		{
+//			if (((Player) data.GetThrower()).getName().toLowerCase().endsWith("s"))
+//			{
+//				((DisguiseInsentient)disguise).setName(C.cAqua + UtilEnt.getName(data.GetThrower()) + "' Minion");
+//			}
+//			else
+//			{
+//				((DisguiseInsentient)disguise).setName(C.cAqua + UtilEnt.getName(data.GetThrower()) + "' Minion");
+//			}
+//
+//			((DisguiseInsentient)disguise).setCustomNameVisible(true);
+//		}
+//
+//		Manager.GetDisguise().disguise(disguise);
 		
 		Manager.GetGame().CreatureAllowOverride = false;
 

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/ExperienceStatTracker.java

@@ -68,12 +68,19 @@ public class ExperienceStatTracker extends StatTracker<Game>
 					
 					//Game Time = 1 Exp per 3 Seconds
 					long time = System.currentTimeMillis();
+					
 					//Exp Until They Quit
-					if (!player.isOnline() && _playerQuitTime.containsKey(player.getName()))
-						time = _playerQuitTime.get(player.getName());
-					//No Time Exp
-					else
-						time = _startTime;
+					if (!player.isOnline())
+					{
+						if (_playerQuitTime.containsKey(player.getName()))
+						{
+							time = _playerQuitTime.get(player.getName());
+						}
+						else
+						{
+							time = _startTime;
+						}
+					}						
 					
 					double timeExp = (time - _startTime)/1500d;
 					

Pocket/LICENSE

@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

Pocket/README.md

@@ -0,0 +1,53 @@
+# ![PocketMine-MP](http://cdn.pocketmine.net/img/PocketMine-MP-h.png)
+
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+__PocketMine-MP is a free, open-source software that creates Minecraft: Pocket Edition servers and allows extending its functionalities__
+
+### [Homepage](http://www.pocketmine.net/)
+
+### [Forums](http://forums.pocketmine.net/)
+
+### [Plugin Repository](http://plugins.pocketmine.net/)
+
+<!--## [FAQ: Frequently Asked Questions](https://github.com/PocketMine/PocketMine-MP/wiki/Frequently-Asked-Questions)-->
+
+### [Official Jenkins server](http://jenkins.pocketmine.net/)
+
+### API Documentation
+ * [Official Doxygen-generated documentation](http://docs.pocketmine.net/)
+ * [Latest Doxygen generated from development](http://jenkins.pocketmine.net/job/PocketMine-MP-doc/doxygen/)
+
+### [Twitter @PocketMine](https://twitter.com/PocketMine)
+
+### IRC Chat #pocketmine (or #mcpedevs) @ irc.freenode.net
+[#pocketmine + #mcpedevs channel WebIRC](http://webchat.freenode.net/?channels=pocketmine,mcpedevs)
+
+### Want to contribute?
+* Check the [Contributing Guidelines](CONTRIBUTING.md)
+
+
+## Third-party Libraries/Protocols Used
+* __[PHP Sockets](http://php.net/manual/en/book.sockets.php)__
+* __[PHP SQLite3](http://php.net/manual/en/book.sqlite3.php)__
+* __[PHP BCMath](http://php.net/manual/en/book.bc.php)__
+* __[PHP pthreads](http://pthreads.org/)__ by _[krakjoe](https://github.com/krakjoe)_: Threading for PHP - Share Nothing, Do Everything.
+* __[PHP YAML](https://code.google.com/p/php-yaml/)__ by _Bryan Davis_: The Yaml PHP Extension provides a wrapper to the LibYAML library.
+* __[LibYAML](http://pyyaml.org/wiki/LibYAML)__ by _Kirill Simonov_: A YAML 1.1 parser and emitter written in C.
+* __[cURL](http://curl.haxx.se/)__: cURL is a command line tool for transferring data with URL syntax
+* __[Zlib](http://www.zlib.net/)__: A Massively Spiffy Yet Delicately Unobtrusive Compression Library
+* __[Source RCON Protocol](https://developer.valvesoftware.com/wiki/Source_RCON_Protocol)__
+* __[UT3 Query Protocol](http://wiki.unrealadmin.org/UT3_query_protocol)__

Pocket/banned-players.txt

@@ -0,0 +1,6 @@
+# Updated 06/29/15 12:14 by PocketMine-MP 1.5dev-1254
+# victim name | ban date | banned by | banned until | reason
+
+fanta|2015-06-29 12:12:30 +1000|CONSOLE|Forever|Banned by an operator.
+xflare_|2015-06-29 12:14:49 +1000|CONSOLE|Forever|Banned by an operator.
+fantasticps3|2015-06-29 12:14:53 +1000|CONSOLE|Forever|Banned by an operator.

Pocket/ops.txt

@@ -0,0 +1 @@
+chiss