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

738 Commits

Author SHA1 Message Date
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
CoderTim 578b5702bc Added commons-dbcp2.jar dependency to Mineplex.Core in eclipse 2014-09-27 04:18:19 -04: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
Shaun Bennett 0139e40957 Re-enable Coin Party Bomb reward for rare treasures 2014-09-17 14:35:43 -05:00
Shaun Bennett cc5db5939d Add Music and Costume pages to cosmetic menu 2014-09-17 14:34:57 -05:00
Chiss 8780d5e4ee MS fixes 2014-09-17 11:18:59 +10:00
Chiss 16214613fe Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-17 08:59:23 +10:00
Chiss e6797582f9 Minor fixes 2014-09-17 08:59:09 +10:00
Shaun Bennett 50fa8b02f1 Use explosion particles instead of createExplosion 2014-09-16 17:57:34 -05:00
Shaun Bennett 918a817283 More treasure bug fixes and animation touches 2014-09-16 15:04:42 -05:00
CoderTim d5313540d7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-15 23:32:04 -04:00
CoderTim c5ff9da552 Record basic game stats (game type, timestamp, duration, winners, losers) 2014-09-15 23:31:53 -04:00
Shaun Bennett 5b77fa09a4 Merge remote-tracking branch 'origin/master' 2014-09-15 19:37:28 -05:00
CoderTim 1b416d3e6f Added database tables to record basic game stats 2014-09-15 16:36:59 -04:00
Shaun Bennett 63b3621ae3 Fix treasure open chest bug, added some animation touches 2014-09-15 13:34:21 -05:00
MrTwiggy abea4223ab Recommit up-time checking to prevent brand new empty servers from being prematurely killed by ServerMonitor. 2014-09-15 13:22:11 -04:00
Shaun Bennett 7c18e89249 Send chest open packets for new players that join in the middle of a treasure 2014-09-15 10:37:40 -05:00
Jonathan Williams c7e0ebefd1 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-13 20:52:13 -10:00
Jonathan Williams a395cae764 Fixes for Custom tag 
Fix for Bridge time
Fix for tournament auto whitelist.
Added UI stuf for tourney

Added build files for arcade.
 2014-09-13 20:50:27 -10:00
Shaun Bennett c1bc9fca2e Small treasure tweaks 2014-09-14 00:29:30 -05:00
Shaun Bennett fc44592edf Merge remote-tracking branch 'origin/master' 2014-09-13 23:07:21 -05:00
Shaun Bennett 228cca4805 fix bug with reward amounts 2014-09-13 23:07:15 -05:00
Jonathan Williams 7ad7dd939d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-12 22:00:18 -10:00
Jonathan Williams 1c3326333d Fix for crash. 2014-09-12 21:59:12 -10:00
Jonathan Williams 4f5430e390 Added tournament stuff. 2014-09-12 21:52:44 -10:00
Chiss e31ab1b37a disabled treasure again! 2014-09-13 16:44:51 +10:00
Chiss 054709a859 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java
 2014-09-13 16:44:11 +10:00
Chiss 31c4a95da5 Disabled Treasure Chests 2014-09-13 16:43:18 +10:00
Shaun Bennett 1e7ed8d491 Treasure rewards + some minor fixes 2014-09-13 01:25:14 -05:00
Jonathan Williams a196e43fde Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
 2014-09-12 19:46:19 -10:00
Shaun Bennett 0afb0f061c Changes to fireworks animation 2014-09-12 23:43:38 -05:00
Shaun Bennett aafdc555b1 Oops, accidentally removed some code! 2014-09-12 23:41:50 -05:00
Shaun Bennett 0f44850367 Treasure stuff 2014-09-12 23:30:00 -05:00
Shaun Bennett 5e9cbcef75 Merge remote-tracking branch 'origin/master' 2014-09-12 23:15:58 -05:00
Shaun Bennett 71f42c6e7b Treasure updates 2014-09-12 23:15:53 -05:00
Chiss a31e20d709 treasure styles 2014-09-13 14:09:50 +10:00
Chiss 4454627b32 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-09-13 13:41:48 +10:00
Chiss e511df4605 Merge treasure 2014-09-13 13:41:37 +10:00
Shaun Bennett fc6a2633c9 Remove debug message, make sure player is far enough from spawn to open treasure 2014-09-12 22:41:10 -05:00
Shaun Bennett a8eeef02dd Adjustments to how treasure rewards are selected 2014-09-12 22:33:22 -05:00
Jonathan Williams 14c4152248 Fixed CustomTagFix. 
Updated ServerData ServerGroup and SErverMonitor for new flags in Arcade.
 2014-09-12 10:03:33 -10:00
Shaun Bennett 20680acea0 More treasure rewards + tweaks 2014-09-12 14:24:30 -05:00
Shaun Bennett dea6c98fc9 Merge remote-tracking branch 'origin/master' 2014-09-12 14:08:22 -05:00
Shaun Bennett 4ea786a1a5 Fix fireworks for 1.8 client, a bunch more treasure stuff 2014-09-12 14:08:10 -05:00
Chiss 5de59b6e0e Hub UHC countdown basics 
UHC MOTD timer stuff
 2014-09-12 18:06:51 +10:00
Chiss 0dff0412d1 Fixed game flag for not allowing inventory opens 
Removed some redundant flags in game
Lots of MineStrike updates
Fixed NPE in WinWithoutLosingTeammateStatTracker
 2014-09-12 11:47:39 +10:00
Shaun Bennett b910c5098c Cross version Holograms (Alignment might be a tad off) 
A bunch of stuff for Treasure Chests
 2014-09-10 12:16:31 -05:00
Shaun Bennett 32bbecd01a Merge remote-tracking branch 'origin/master' 2014-09-09 19:27:16 -05:00
Shaun Bennett c4ad00bef1 add armor stand hologram, just to send code to laptop 2014-09-09 19:27:05 -05:00
Shaun Bennett 652075138e More treasure rewards work 2014-09-08 13:26:18 -05:00
Chiss 347e2b1bf5 Changed FIRE items to Blaze Powder 2014-09-08 10:14:55 +10:00
CoderTim 3e5b827a7f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-09-07 18:10:31 -04:00
CoderTim 201782a7cd Added leaderboard.php 2014-09-07 18:09:46 -04:00
Shaun Bennett 6441b110b4 Treasure stuff from laptop 2014-09-07 13:35:49 -05:00
Jonathan Williams 558231457c Fixed disguises leaving extra tags 
Fixed memory problem in Arcade.
 2014-09-06 03:39:20 -07:00
Shaun Bennett 86d063dafb Merge remote-tracking branch 'origin/master' 2014-09-06 01:07:49 -05:00
Shaun Bennett 15b46e8f96 Fix displaying on stats on achievement gui 2014-09-06 01:07:40 -05:00
Chiss 644d3da050 JOOQ for Eclipse 2014-09-06 11:31:55 +10:00
Shaun Bennett eb27c1dfbe Add Util class for sending titles to players 2014-09-05 19:46:11 -05:00
Jonathan Williams 2f8b53f771 Fix for customer support server. 
Fix for Boss bar junk.
Fix for Disguises.
 2014-09-05 14:36:10 -07:00
Jonathan Williams d01529a344 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2014-09-05 04:38:23 -07:00
Jonathan Williams 1c6790b611 Fixed for DisguiseManager 
Rewrote packet handling
Fixed up CustomTagFix
Removed swapping kits in Block Hunt
Removed Stacked entities for 1.8 players.
 2014-09-05 04:36:01 -07:00
CoderTim 91a2266a04 Set up jOOQ, fixed some IntelliJ issues, and added leaderboard stat tracking 2014-09-05 04:00:51 -04:00
Jonathan Williams b28fc8ee6b Added custom name tag fix for mobs for 1.8 players 
Worked on boss bar display.
Bug with <=50% hp.
 2014-09-04 11:33:51 -07:00
Shaun Bennett e7f79aa5bf Update IntelliJ files for latest changes 2014-09-03 11:42:50 -05:00
Jonathan Williams 92191dc19a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_7_R4/PlayerConnection.java
 2014-09-03 03:47:15 -07:00
Jonathan Williams a4871b5509 Updated to latest spigot with 1.8 support. 
Tweaked disguise manager for 1.8 support.
Work on CUstomer support server + admin stuff.
 2014-09-03 03:46:24 -07:00
Shaun Bennett 08e6b73b1f Disable Treasure stuff for now 2014-09-02 19:04:43 -05:00
Shaun Bennett 2b3f6c9dbc Prevent minecart mounts from being broken by others 2014-09-02 19:03:14 -05:00
Shaun Bennett 2d5c676e1b Merge remote-tracking branch 'origin/master' 2014-09-02 18:57:35 -05:00
Shaun Bennett 4ad034b8d9 more treasure stuff, really basic holograms 2014-09-02 18:33:40 -05:00
Chiss 05623b7522 Initial MineStrike push 
fixed frames being breakable in games
 2014-09-01 21:37:39 +10:00
Jonathan Williams 8198bb31c8 Added sneaking to player disguise. 
Did work on DDoSProtectionSwitcher
Work on AccountAdministrator to fix rank issues.
 2014-09-01 00:56:32 -07:00
Shaun Bennett 5905ef5ef7 Treasure Stuff 2014-08-30 14:27:11 -05:00