Commit Graph

861 Commits

Author SHA1 Message Date
Shaun Bennett f48085d5ca Merge remote-tracking branch 'origin/master' 2014-12-04 17:41:40 -06:00
Shaun Bennett 0bb2d1db5b Some changes *_* 2014-12-04 17:29:47 -06:00
Jonathan Williams 59f93d46ec Refactored IButton
Added ComplexButton

Added Clans farming.
Added Clans Recipes.
Added Clans gameplay.
Added shop files structure.
2014-12-04 05:05:27 -08:00
Jonathan Williams 1fd1e5cc34 Removed unused gem booster code. 2014-12-02 12:50:53 -08:00
Jonathan Williams 384f296d60 checkPlayerName returns actual name (casing correct)
Refactored chests/keys in support server.
Fixed bug with enjin chest/key giver.
2014-12-01 16:14:02 -08:00
Jonathan Williams 0540168af7 Fixed CCM in AntiHack 2014-12-01 03:01:26 -08:00
Jonathan Williams e7cf4eb51d Removed use of Gem Boosters
Cleaned up some unused imports.
2014-12-01 02:27:39 -08:00
Jonathan Williams 172f4d20b7 Removed gem transaction logging. 2014-12-01 02:22:51 -08:00
Jonathan Williams 5038edc46b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-12-01 00:07:33 -08:00
Jonathan Williams 171eec5a37 Removed reward logging. 2014-12-01 00:05:57 -08:00
libraryaddict 89892097d0 No one cares about ComplexItemLayout 2014-11-30 16:48:57 +13:00
Jonathan Williams 9d32048b9e Fixed merge conflict problem.
Added spawn repository.
2014-11-29 03:17:33 -08:00
Jonathan Williams f507db7664 Reworked spawn to save to database.
Work on Clans:
Fixed clan loading/updating/adding.
Refactored some code for Clans.
2014-11-29 03:16:37 -08:00
Jonathan Williams 4b2998793c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-28 14:16:07 -08:00
Chiss b3beadf8b5 made recharge look nicer for 1.7
added missing files
2014-11-29 09:14:33 +11:00
Jonathan Williams 54aefbf40d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-28 14:10:28 -08:00
Chiss ca34ac4e02 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-29 09:09:23 +11:00
Jonathan Williams 92ea94c3be Fixed creating clan delay in clans/ClientClan.java
Added logging for Mineplexer startup.
Fixed return generated keys in RepoBase
2014-11-28 14:06:41 -08:00
libraryaddict e56970a212 Let ShopItem no longer extend CraftItemStack and instead extend ItemStack to remain useful to other plugins and use ItemMeta 2014-11-29 07:21:37 +13:00
Jonathan Williams 62a172e01b Removed all the UUIDFetcher calls. 2014-11-27 22:34:05 -08:00
Chiss 8f9f88987b mods can no longer use /tp Here
only disqualifies on tp in live games.
2014-11-28 10:09:18 +11:00
Chiss fdc67e021c Staff using /tp commands will take them out of the game (Mod to Admin only)
Changed spec /tp command to /spec
2014-11-28 10:00:31 +11:00
libraryaddict d5d9e2eb14 Don't bother with these checks in ItemLayout 2014-11-28 09:30:57 +13:00
libraryaddict 8d12b8e565 Check item has Lore before trying to use it 2014-11-28 09:30:27 +13:00
libraryaddict d1b6aee802 Change ItemLayout to allow repeats of item arrays 2014-11-27 14:34:34 +13:00
libraryaddict bd8ca593e8 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SearchAndDestroy 2014-11-27 08:06:13 +13:00
libraryaddict ac0c024b1b Use nmsPlayer.m() instead. This sets both the container to default and tells the open inventory to close. Which fixes any normal blocks like DoubleChest from remaining visually open to others. 2014-11-27 07:16:59 +13:00
libraryaddict 86fe7344c7 When another inventory is opened with a previous inventory already open, this fixes the cursor position from being reset to the center of the screen. For those interested. Its basically denying the inventory close packet from being sent. 2014-11-27 06:56:19 +13:00
libraryaddict 34e320dfee Create untested ItemLayouts for your customized layouts of your items.
If you look to your right (ComplexItemLayout) you can define layouts such as "XX(de)XX(fg)XX" then call to replace all occurances of the letter d with this item. The (de) will then be set to that item.
2014-11-27 06:03:28 +13:00
libraryaddict b160822260 Add follow entity to holograms 2014-11-27 03:17:59 +13:00
libraryaddict f5533dbce2 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SearchAndDestroy 2014-11-27 01:13:14 +13:00
libraryaddict c76ad50136 Allow removal of packet handler 2014-11-27 01:08:42 +13:00
libraryaddict 84b56708f9 Added new class ItemBuilder for chain building ItemStacks 2014-11-27 01:08:38 +13:00
libraryaddict 9928811a71 Merge pull request #2 from Better-Holograms to master
* commit 'ef59cb7a9db25b8688ee6e3254661d9cc65a5e89':
  Remove the 'Made by Shaun'
  Fix up mistakes in the previous modifications
  You have your HologramManager presented in a light most fair. Should be worth noting I didn't test it thoroughly
  Ignore wither skulls for CustomTagFix
  Remove old holograms and add new holograms
2014-11-26 06:07:57 -06:00
libraryaddict ef59cb7a9d Merging changes from master to Better-Holograms
* master:
  Antistack replacement

Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2014-11-27 01:01:19 +13:00
libraryaddict 30e2de6f22 Remove the 'Made by Shaun' 2014-11-27 00:50:02 +13:00
Jonathan Williams 00e372820b Fixed UI update when purchasing items. 2014-11-26 02:13:19 -08:00
Jonathan Williams 2afe84d7c7 Fixed stupid query thing....defek7.
Removed extra logging.
2014-11-26 00:59:10 -08:00
libraryaddict 3ad3fb21ff Fix up mistakes in the previous modifications 2014-11-26 21:35:45 +13:00
Jonathan Williams f39e3dcec7 Fixed traversing resultSets. 2014-11-26 00:08:51 -08:00
Jonathan Williams 06526d1e96 Fixed sql bug in FriendRepository
move/cleanup in RepoBase
2014-11-25 21:45:34 -08:00
Jonathan Williams 15d129d184 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitData.java
2014-11-25 21:18:12 -08:00
Jonathan Williams 909877c869 Wiggle left, wiggle right, hope this works. 2014-11-25 21:17:30 -08:00
Chiss 4ccb242066 i added a space! 2014-11-26 16:02:11 +11:00
libraryaddict 03075fecae You have your HologramManager presented in a light most fair.
Should be worth noting I didn't test it thoroughly
2014-11-26 10:28:37 +13:00
Jonathan Williams 484dfaaea9 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-11-25 13:25:41 -08:00
Jonathan Williams 3b54789767 Optimized logins dealing with mysql with multiqueries.
Added lazy loading of Pool data and Loaded check before performing anything.

Refactored MiniClientPlugin and created MiniDbClientPlugin

Renamed RankBenefitManager9000 to BenefitManager

Removed /send ability for now.
2014-11-25 13:25:13 -08:00
libraryaddict 3c76fde190 Ignore wither skulls for CustomTagFix 2014-11-26 09:51:08 +13:00
libraryaddict 141c08ceb8 Remove old holograms and add new holograms 2014-11-26 09:18:36 +13:00
Shaun Bennett f1fbc21570 Merge remote-tracking branch 'origin/master'
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
2014-11-23 20:02:09 -06:00