Commit Graph

32 Commits

Author SHA1 Message Date
Jonathan Williams 49bfe385bf Revert "Work on treasure............"
This reverts commit 50a8fb03a9.

REVERT ALL SHAUNS CRAP.
2015-01-29 22:28:41 -08:00
Shaun Bennett 1cc0879ce9 treasure stuff 2015-01-29 22:17:46 -05:00
Jonathan Williams b92226a771 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-01-23 00:55:36 -08:00
Jonathan Williams 08078c1622 Removed Logger 2015-01-22 23:18:38 -08:00
Shaun Bennett 882eb46479 Unclaiming land when you run out of energy 2015-01-22 21:32:10 -05:00
Shaun Bennett 2bab4133b0 Fix ugly /gold command 2015-01-22 20:41:05 -05:00
Shaun Bennett a1f2a3a2a1 Clan Energy 2015-01-22 20:34:44 -05:00
Jonathan Williams 8e04a2a5f2 Portal now checks server status and player's rank before sending them to a server to prevent login spam.
Refactored portal method names.
2015-01-11 00:42:31 -08:00
Jonathan Williams f0e3520343 Prevent inferior ranks to override actual ranks unless its Rank.ALL via Enjin 2014-12-29 08:02:14 -05:00
Jonathan Williams 97f57b655b Prevent horses from spawning in Clans
Added Building supplies shop and pvp shop to clans.
2014-12-29 06:44:00 -05:00
Jonathan Williams 9b3350c8c7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-12-22 09:22:50 -05:00
Jonathan Williams d920439ec5 Clans update. Laying groundwork for energy 2014-12-22 09:22:10 -05:00
Chiss 679f7909b0 Merge branch 'feature/private-servers' of ssh://184.154.0.242:7999/min/mineplex into feature/private-servers 2014-12-18 12:45:56 +11:00
Shaun Bennett d19431a47f Rename Clicked to onClick 2014-12-17 18:40:44 -06:00
Shaun Bennett 1260e875fd Add clans to intellij. Update button 2014-12-17 18:38:35 -06:00
Jonathan Williams 6941c1c827 Added a few more items for BuildingShop in Clans. 2014-12-15 21:29:50 -05:00
Jonathan Williams 5b67e2182a Added disguise to Pet Manager for eventual wither disguised pet. 2014-12-14 02:30:39 -05:00
Jonathan Williams 342c44affc Fixed a bunch of clans bugs 2014-12-08 00:55:20 -08:00
Jonathan Williams 60a46d5adf Replaced Dwarf Toss with Block Toss in Clans. 2014-12-06 04:23:26 -08:00
Jonathan Williams 3d3f9012ff Added some base Clans shops.
Added support for Gold

Refactored failed db call code a bit.
2014-12-04 23:41:49 -08: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 abaf9f4693 Refactored IRelation method names
Added support for negative amounts in Support server.

Clans in core testing state.
2014-12-03 13:06:50 -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 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 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
Jonathan Williams 515176b63f Clans to buildable state. 2014-11-27 22:34:20 -08:00
Jonathan Williams 1198426d8d Little more work on Clans. 2014-11-23 05:08:33 -08:00
Jonathan Williams 1a6b80b08e More work on clans..
Finished ClansDataAccessLayer
Finished ClansAdmin
Finished ClansDisplay
2014-11-19 22:24:36 -08:00
Jonathan Williams df76f6be10 More work on Clans. 2014-11-15 01:13:14 -08:00
Jonathan Williams 4812da2cd9 More work on Clans - Clan repository. 2014-11-13 19:14:56 -08:00
Jonathan Williams 1372f74921 Refactored some names in MiniPlugin
Work on clans.
2014-11-12 19:21:12 -08:00
Jonathan Williams 8d62966abc Created Clans project.
Converted Fields code complete (not tested).
2014-11-12 05:13:16 -08:00