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

637 Commits

Author SHA1 Message Date
Chiss ffc2ff5058 Modifided output of friends list 
- buttons to left side for alignment
- sorted by sent>offline>pending>online
- improved 'no friends' message
 2014-10-09 12:15:45 +11:00
Chiss 7a345dce95 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-05 13:40:15 +11:00
Chiss d3f87dff46 MineStrike update 2014-10-05 13:37:27 +11:00
Shaun Bennett 39b03b7533 Change time command to mod+ 2014-10-04 00:20:35 -05:00
Shaun Bennett 520ade8249 Merge remote-tracking branch 'origin/master' 2014-10-03 20:41:06 -05:00
Shaun Bennett ef82aa08b1 Time command for mod+ 2014-10-03 20:40:58 -05:00
Jonathan Williams 66457ded60 Fix initial friends date load for offline time. 2014-10-03 02:05:55 -07:00
Jonathan Williams 9033843a31 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-03 01:50:35 -07:00
Jonathan Williams c641eab3c7 Fixed up friends. 2014-10-03 01:50:23 -07:00
Shaun Bennett 4253c08682 Fix time 2014-10-02 20:25:50 -05:00
Shaun Bennett a6fea938b9 Fix some duplicate code 2014-10-02 20:01:33 -05:00
Shaun Bennett 07576a2b12 Add gamesplayed and timeingame to gui 2014-10-02 19:48:25 -05:00
Jonathan Williams 9b2a2cbbd6 Fixed mounting blocks on yourself in 1.8 
Added temp fix so 1.8 players can ride dragons again.
Removed Block form in parkour and fly for block form.
 2014-10-01 02:12:11 -07:00
Jonathan Williams c2b84cc60f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-30 12:20:14 -07:00
Jonathan Williams 0228ef5921 Staff server work to include treasure chests/keys and gem hunter level 8, 12. 2014-09-30 12:20:01 -07:00
Shaun Bennett c7d34e70ef Merge remote-tracking branch 'origin/master' 2014-09-29 17:42:13 -05:00
Shaun Bennett 92f8dc7f61 Add velocity toggle for mod+ 2014-09-29 17:17:02 -05:00
Shaun Bennett 7892c442d0 Add show mac reports user pref for mod+ 2014-09-29 11:14:20 -05:00
Jonathan Williams eaee6c2733 AWork on FRiends. 2014-09-26 12:38:51 -07:00
Jonathan Williams 34baa8eafb Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-25 23:27:19 -07:00
Jonathan Williams 8bca23f0ba Fixed bug with custom tag fix :P 
Fixed bug with server group up time check in servermonitor.
 2014-09-25 23:27:08 -07:00
Shaun Bennett 7ee4f549f8 Merge remote-tracking branch 'origin/master' 2014-09-25 18:04:06 -05:00
Jonathan Williams 91ca7fa6c6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-25 05:37:21 -07:00
Chiss 79e808814a Minestrike cleans up incendiary at the end of rounds 2014-09-25 20:52:13 +10:00
Jonathan Williams 1f0bd462e3 Fix for CustomTagFix leak. 2014-09-24 22:14:26 -07:00
Shaun Bennett f5c8b2b1ac Fix renaming pets for 1.8 clients 2014-09-24 22:31:09 -05:00
Shaun Bennett 57487e78cf Fix Gem Booster display bug 2014-09-24 21:59:25 -05:00
Jonathan Williams a54a2aadc0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-24 01:32:03 -07:00
Jonathan Williams d32085f05b Removed tab list stuff for friends. 
Implemented rudimentary friends chat list.
removed unused code in server stuff.
Added null check for retrieving server statuses.
 2014-09-24 01:31:56 -07:00
Chiss 969c7c0fde Music gadget fixes 
Tournament point tally
Removed snow from frosty HorseMount
Added Tournament hub invite messages
 2014-09-24 15:46:55 +10:00
Chiss 5774de552d Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-22 17:53:39 +10:00
Chiss a58335d906 Added GameStatManager.java 2014-09-22 17:46:36 +10:00
CoderTim 77e21c0d99 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-22 02:53:55 -04:00
MrTwiggy 5c9ee3e79e Add ServerCommand system for live cross-server commands,. Update Queuer to support Redis based database and functionality. Fix ServerStatus start up dates to synchronize properly with central Redis time. Add new DataRepository's for easier dynamic object storage in redis. Update Portal server-transfers to support new cross-server command system rather than database stored server transfers. 2014-09-21 20:42:47 -04:00
CoderTim 1949de4fd7 Database implementation of NpcManager partially complete 2014-09-21 15:45:15 -04:00
Chiss a830c72d22 Jukebox will be removed. 2014-09-20 15:29:59 +10:00
Chiss be3e10a412 Treasure now reverts BlockRestore changes before changing blocks. Prevents artifact blocks being left behind. 2014-09-20 09:31:06 +10:00
Chiss 0d090d7bdc fixed issue with MASSSSSSSSSIVE PLANET SIZED gui scale 
added lore to coins in GUI, to help new players and sell more ranks
slightly lowered hitbox for headshots in minestrike
 2014-09-20 09:10:55 +10:00
Chiss 9bbac7578e Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java
	Plugins/Mineplex.Hub/src/mineplex/hub/modules/ParkourManager.java
 2014-09-20 08:29:06 +10:00
Jonathan Williams 960b0aa69e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/modules/ParkourManager.java
 2014-09-19 09:23:52 -10:00
Shaun Bennett ed85779876 Fix Treasure painball gun issue, fix parkour paintbull gun issue 2014-09-19 14:18:23 -05:00
Jonathan Williams 96498af626 Fixed parkour bug with gadget blocks. 
Removed a ton of debug messages with inventory close.
 2014-09-19 09:06:42 -10:00
Jonathan Williams d0edde9dbd Added rank benefit giver 9000 
Added MineStrike to beta timer.

Updated official craftbukkit.jar
 2014-09-19 02:57:35 -10:00
Jonathan Williams c8e755fe5f Reverted and merged twigs status update. (Needs fix on startDate.) 2014-09-18 22:22:01 -10:00
Jonathan Williams 239b021b0d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-18 22:03:49 -10:00
Chiss 91037384f9 Loot tweaks 
Music fixes
some bug fixes
 2014-09-19 18:01:38 +10:00
Jonathan Williams 7906f48262 Updated CoreClientManager to pull all account data via name request. 
Cleaned up some code with pet administrator.

added logging if 0 rows were being saved in CommitChanges
 2014-09-18 21:12:37 -10:00
Shaun Bennett 5c791090fc Open all treasures after 60 seconds 2014-09-19 00:48:11 -05:00
Shaun Bennett 3d04b27898 Prevent Gadget block changes from affecting treasure 2014-09-18 23:03:08 -05:00
Shaun Bennett 1a9f676a61 Merge remote-tracking branch 'origin/master' 2014-09-18 22:41:32 -05:00