JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,287 Commits 1 Branch 0 Tags 481 MiB
Commit Graph

2287 Commits

Author SHA1 Message Date
libraryaddict 41a1ff5842 Merge pull request #4 from blockhunt to master 
* commit '048aa40590b2d64b9219d2459ab865e3f273117e':
  Remove comments and add comments
  Read merge message
 2014-12-05 08:26:37 -06:00
libraryaddict 048aa40590 Remove comments and add comments 2014-12-06 03:25:53 +13:00
libraryaddict 307d280534 Read merge message 2014-12-06 02:22:52 +13:00
Jonathan Williams 21e80af6cb Fixed Cosmetic menu buttons 
Removed map in wrong location
Removed message for removing armor.
 2014-12-05 01:15:25 -08:00
Jonathan Williams 828e8d4115 Fixed bug with ok buttons still active after clicking ok in confirmation page. 2014-12-04 23:48:22 -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
Chiss 80971c2fe7 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-12-05 16:27:30 +11:00
Chiss 4430efd7be minor updates 2014-12-05 16:25:34 +11:00
Shaun Bennett 54d8fe21fb Notifications and stuffs? 2014-12-04 22:48:54 -06:00
Shaun Bennett 03bd2ed2c1 Make JsonMessage a little easier to use, might be worth it to increase functionality later as more complicated things are added to json text 2014-12-04 17:48:06 -06:00
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 fbcc774383 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-12-04 05:05:43 -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
Chiss 38639fb58f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/Taunt.java
 2014-12-04 13:34:08 +11:00
Chiss 6cc4ec034b Champs Updates 
UHC Y Limit in middle
 2014-12-04 13:33:31 +11: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 1fd1e5cc34 Removed unused gem booster code. 2014-12-02 12:50:53 -08:00
Jonathan Williams b0f13cc7f0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-12-01 23:53:42 -08:00
Jonathan Williams 63506c9ebc Changed message in CUST-1 
Fixed how QueuedCommands are handled, don't rerun website api call if it succeeded.
 2014-12-01 23:53:35 -08:00
Chiss a8deee5292 fixed a spelling error 2014-12-02 18:04:48 +11:00
Chiss 340f5d87a4 removed debug 2014-12-02 12:30:59 +11:00
Chiss e63ef8a607 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-12-02 11:50:03 +11:00
Chiss 5695e845ef resistence no longer effects hold position. 2014-12-02 11:49:39 +11:00
Jonathan Williams 7a3b4771ee Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-12-01 16:14:15 -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
Chiss 6319bffd42 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-12-02 09:50:47 +11:00
Chiss 185b182061 fixed teleports removing you from the game 2014-12-02 09:50:30 +11:00
Jonathan Williams 78a0aa7c96 Added checks to restart UHC servers stuck in restarting mode. 2014-12-01 03:34:37 -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 3584c0d8af Added Key/Chest support for EnjinListener 2014-12-01 02:03:46 -08:00
Jonathan Williams 9d39cb922c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-12-01 01:22:51 -08:00
Jonathan Williams 433483dcca Fixed error in GameLootManager 2014-12-01 01:22:43 -08:00
Chiss 39faf35409 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-12-01 19:33:55 +11:00
Chiss cee48f1978 made it so you can use fireworks without aiming against block in blockhunt 
removed fire from magma blast
private blocks are no longer private if owner is dead
 2014-12-01 19:33:36 +11: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
libraryaddict 9ddd0bd9cc Player now sees theirselves disguised as the same block they are disguised as. 2014-11-30 16:39:27 +13:00
libraryaddict effc026913 Lets just pretend this was the original commit.. 2014-11-30 15:56:50 +13:00
libraryaddict ec26b8b642 Max item amount is 10 for non-bow classes. So sayth Chiss 2014-11-30 15:55:57 +13:00
libraryaddict 0813f0a914 Instead of having a internal entityId. Use mojang's entityid's but add one everytime you want it. Also allow fetching of the next entityid to be used 2014-11-30 15:41:57 +13:00
libraryaddict e654b23a50 We don't need that debug output 2014-11-30 15:06:50 +13:00
libraryaddict 5157c2bf37 Disable hiders from seeing their own block 2014-11-30 15:06:18 +13:00
libraryaddict 54fe312251 Untested fix I'm 99% sure will fix hide and seek players being blinded 2014-11-30 13:47:07 +13:00
libraryaddict f8869a84ba Don't send the player himself the block change.. 2014-11-30 13:22:01 +13:00
libraryaddict 751731a1ad Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-11-30 12:14:51 +13:00
libraryaddict 00d3e66ac4 Commit my current work on SnD kits 2014-11-30 12:12:02 +13:00