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

695 Commits

Author SHA1 Message Date
Jonathan Williams
1dd51bcac5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-13 21:07:10 -05:00
Chiss
15b6a80613 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-10-14 13:02:17 +11:00
Chiss
ed9dd6e894 Minor patches 2014-10-14 12:42:53 +11:00
CoderTim
8f90c96019 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-13 20:45:55 -04:00
CoderTim
2016ea09cb Added achievements to games and Achievement enum 2014-10-13 20:38:58 -04:00
Jonathan Williams
0194a041e2 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-12 20:57:32 -07:00
Jonathan Williams
3e7787a354 Fix for customer support GemHunterCommand 
Fix for UUIDFethcer pulling while player is online.
 2014-10-12 20:57:17 -07:00
Chiss
a4b85053d9 fixed bug where blockmorph was crashing hubs. 2014-10-13 14:56:19 +11:00
Chiss
25fbe24d20 improved sound output of coin bomb 2014-10-13 14:13:57 +11:00
Chiss
e41b10ccb8 minor UHC fix 2014-10-13 14:09:58 +11:00
Chiss
9cc28d1ad8 MAC Update 2014-10-12 14:19:35 +11:00
Jonathan Williams
d3788e8ddc Fixed redis server time functions. 
Added kill option for servers with motd Finished in servermonitor
 2014-10-11 04:40:53 -07:00
Jonathan Williams
797dd002ad Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-10-11 02:43:56 -07:00
Jonathan Williams
a54b78fefa Added Mine-Strike to Quick Game menu. 
Fixed up CoreClientManager's rank update.
 2014-10-11 02:32:02 -07:00
Jonathan Williams
19afebe53d Added in mysql hooks for coins/gems/ranks for database conversion preperation. 
Added in failover database calls in CoreClient/DonationManager
 2014-10-11 01:32:22 -07:00
CoderTim
3422f48325 New acheivements 2014-10-10 21:49:03 -04:00
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
Jonathan Williams
bf11635616 Fixed GemHunter in StaffServer and added offline stat increment :) 2014-10-04 15:43:33 -07: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
CoderTim
b78132ebfc Renamed NpcManager methods 2014-10-02 22:18:25 -04:00
CoderTim
addc423c2d Added /npc clear back 2014-10-02 22:15:12 -04:00
CoderTim
f6f484c134 Refactored /npc commands 2014-10-02 22:08:00 -04: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
CoderTim
a5a2c1a837 Partially done refactoring NpcManager 2014-09-30 11:03:23 -04: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
CoderTim
ba2f0e37ef Log changes in players' coins to database 2014-09-25 17:03:26 -04: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
Shaun Bennett
3eb61135c9 Fix treasure message 2014-09-18 22:39:42 -05:00
Chiss
01a6ff6069 costume reward fix 
hub builder including database
 2014-09-19 13:01:49 +10:00
Shaun Bennett
1370a0eeac Clean up RewardRarity 2014-09-18 21:24:14 -05:00
Shaun Bennett
aad3d59177 Merge remote-tracking branch 'origin/master' 2014-09-18 21:03:59 -05:00
Shaun Bennett
5d643c00d5 treasssssurreeeeees 2014-09-18 21:03:46 -05:00
Chiss
27587a2a11 fixed players being able to be pushed into portals by gadgets 2014-09-19 11:15:48 +10:00
Chiss
a0e9d6f6fd fixed a portal break bug 
reduced lag from coin bomb
 2014-09-19 10:59:26 +10:00
Chiss
4b602c1b83 Inventory Update 
added Jooq to Hub build
 2014-09-19 10:36:41 +10:00
Shaun Bennett
c93fee2b53 Fix typos for pets 2014-09-18 18:10:33 -05:00
Shaun Bennett
ee64ff2bf6 Dispose of Shop if the InventoryOpenEvent gets cancelled 2014-09-18 17:48:35 -05:00
Shaun Bennett
2008dae57b Adjust treasure message 2014-09-18 17:38:05 -05:00
Shaun Bennett
51ad6d8368 Open Treasure chests through cosmetic gui, purchase treasure keys, some bug fixes 2014-09-18 17:33:05 -05:00
Shaun Bennett
b8d157f99f Add costumes to RewardManager 2014-09-18 14:47:22 -05:00
Shaun Bennett
76df00978a Add music discs to RewardManager 2014-09-18 14:43:07 -05:00
Shaun Bennett
88a8e3a896 Hackyish way to log rewards given out in a database 2014-09-18 14:35:59 -05:00
Chiss
ed59e03795 Loot update 2014-09-18 17:05:56 +10:00
Shaun Bennett
e5d5cda9fd Merge remote-tracking branch 'origin/master' 2014-09-18 00:46:41 -05:00
Shaun Bennett
87bd5d8f7f Add coin party bomb to rare rewards, fix reward values from last commit 2014-09-18 00:46:33 -05:00
Chiss
3fd312ff95 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-18 15:45:01 +10:00
Chiss
fed3d31374 MineStrike fixes 2014-09-18 15:44:48 +10:00
Shaun Bennett
6c4479298d Fix RewardManager bug, fooling around with animations 2014-09-18 00:41:56 -05:00
Shaun Bennett
9d0b99b7fc Merge remote-tracking branch 'origin/master' 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java
	Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java
 2014-09-17 23:56:42 -05:00
Chiss
09a3cc16b0 Reward stuffs 2014-09-18 14:36:22 +10:00
Chiss
bb8e481c7f More Reward stuff 2014-09-18 14:25:39 +10:00
Chiss
c625fb4121 Restructured rewards for Post-Game rewards 2014-09-18 13:21:30 +10:00
Shaun Bennett
33d33f84b4 More treasure animation touches + fixes 2014-09-17 15:22:54 -05:00
Shaun Bennett
da680359d0 Change formatting of treasure announcements 2014-09-17 14:50:34 -05:00
Shaun Bennett
90e402bf69 Fix menu slots 2014-09-17 14:43:58 -05:00