Commit Graph

751 Commits

Author SHA1 Message Date
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
Jonathan Williams c8bc697888 Fixed mounts and gadgets for rank messages...no Purchase. 2014-08-30 02:37:27 -07:00
Jonathan Williams f6dcebc3dc Fixed extra spacing in cosmetic menu. 2014-08-30 02:33:37 -07:00
Jonathan Williams 72aa05f73e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-30 02:26:16 -07:00
Jonathan Williams 829736ed07 Fixed purchase info. 2014-08-30 02:26:07 -07:00
Shaun Bennett e52f6deab4 Merge remote-tracking branch 'origin/master' 2014-08-30 04:24:34 -05:00
Shaun Bennett 6a58b86a19 Don't display wins and losses to other players on Achievement Gui 2014-08-30 04:24:25 -05:00
Jonathan Williams b07670f6af Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-30 02:04:32 -07:00
Jonathan Williams 1bd0209b39 Added multi-server tags for npcs
Fixed Customer support packages.
Fixed Account rank expire for Hero
Added SNR mod to update Rank
Changed SNR mod color to gray.
2014-08-30 02:04:04 -07:00
Chiss 41daba98c4 Background work for Minestrike
Admins no longer have OP in hubs. They have /gm command to gamemode.
2014-08-29 18:21:08 +10:00
Chiss 1f6b9374eb disable le minestrike 2014-08-29 11:55:06 +10:00
Chiss c3bb0ddbcb Chest example gadget for shauny 2014-08-29 11:00:16 +10:00
Jonathan Williams 409e2c6141 Tweaked menus for quick game, Cosmetic menu.
Removed debug for Hub
Output a little debug info in LobbyBalancer
Added duplicate check to ServerMonitor
updated Customer SUpport server to have changeable password, added logging of command executors, added lifetime perks for hero/ultra
2014-08-28 14:01:37 -07:00
Jonathan Williams 526ca42add Fixed Gem booster problem.
FIxed stat problem.
2014-08-27 12:48:24 -07:00
Chiss 311711f2f0 Disabled fireworks for non-gadget enderpearls. 2014-08-27 15:24:10 +10:00
Chiss 9cde497a5c Fixed ethereal pearl text 2014-08-27 15:20:55 +10:00
Chiss 9439daa852 Fixed bug where spectators could trigger anti-cheat in bridges 2014-08-27 15:16:20 +10:00
Chiss 596bcbfae6 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-27 14:23:01 +10:00
Chiss da5f953212 Fixed BlockMorph leaving blocks behind when player was teleported. 2014-08-27 14:22:35 +10:00
Shaun Bennett 8439838328 After years of research and experimenting, we settled on an achievement icon 2014-08-26 19:01:59 -05:00
Shaun Bennett 78eee68592 Change achievement icons, fix another typo 2014-08-26 18:39:01 -05:00
Shaun Bennett c04319345a Merge remote-tracking branch 'origin/master' 2014-08-26 17:41:07 -05:00
Shaun Bennett 507d356346 Fix last achievement typo 2014-08-26 17:40:58 -05:00
Jonathan Williams 232785a7dd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-26 04:56:34 -07:00
Jonathan Williams 417d398195 Swapped Morph and Pet active slot.
Fixed a couple things on Staff server.
2014-08-26 04:56:23 -07:00
Shaun Bennett 99951bc573 Fix achievement typos 2014-08-26 04:20:33 -05:00
Jonathan Williams 064b0e8b36 Removed sheep mount and fixed up server monitor. 2014-08-26 01:31:57 -07:00
Chiss 81e92c0e8e changed wording in achi GUI 2014-08-26 18:24:20 +10:00
Chiss 6f1204c844 Set gem reward for all achievements 2014-08-26 18:20:33 +10:00
Chiss ab29a5fa29 Fixed text output in Achi GUI for completed 2014-08-26 18:06:01 +10:00
Chiss d62b59776f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-26 17:54:50 +10:00
Chiss 116fe496a8 Changed post game achievement output
Added Reward to Achi GUI
2014-08-26 17:53:54 +10:00
Jonathan Williams 7a8ab5c96a Comment for weirdness. 2014-08-26 00:53:41 -07:00
Jonathan Williams a4cf9e2f4b Fixed stat bugs. 2014-08-26 00:52:51 -07:00
Jonathan Williams 526b5c333a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-26 00:34:00 -07:00
Jonathan Williams 137b8692e4 Added Gem booster use. 2014-08-26 00:33:48 -07:00
Chiss 0546c9e175 Fixed so only Supply drop chests trigger achievement 2014-08-26 17:33:23 +10:00
Chiss 1b15a57fc8 Added Gem Rewards for Achievements 2014-08-26 17:10:20 +10:00
Jonathan Williams 162a86d4b2 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/CosmeticShop.java
2014-08-25 23:58:54 -07:00
Jonathan Williams b8b6c031cd Re-did and added a game to the quick game menu.
Fixed npc triggers with non npcs named the same.
Fixed naming pet longer than 16 chars.
Added sugar cane to restricted block type for paintball gun
Properly hooked in gadget block event for paitnball gun.
Added auto purchase page on item gadget ammo empty.
Added check on rank for customer support command.
Fixed ConcurrentModificationException problem with spigot.
2014-08-25 23:56:58 -07:00
Chiss 95e7517a9e disabled debug cmd for rave suit 2014-08-26 16:17:38 +10:00
Chiss 8fc6013ff3 Disabled Chest GUI 2014-08-26 16:12:01 +10:00
Chiss dd61077850 Added missing Achievements 2014-08-26 14:46:10 +10:00
Chiss 1b3e32ca26 Added Arcade Achievements 2014-08-26 14:42:17 +10:00
Chiss f0e01aa257 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-26 13:42:54 +10:00
Chiss 28d523d696 Added Achievements 2014-08-26 13:42:42 +10:00
Shaun Bennett 905d4db6f1 Use emerald instead of bed 2014-08-25 21:32:30 -05:00
Shaun Bennett 2e0b074053 More achievement gui changes 2014-08-25 20:56:21 -05:00
Chiss 07ee44508e Missing Gadgets 2014-08-26 08:17:41 +10:00
Chiss 0e3cf67402 Some new cosmetics 2014-08-25 12:59:29 +10:00
Chiss 13eb3da0fa Achievment gui changes 2014-08-25 09:26:01 +10:00
Shaun Bennett ff441f2262 Merge remote-tracking branch 'origin/master'
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementData.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2014-08-24 16:14:29 -05:00
Shaun Bennett 2cb87b23e6 Stat Gui, Start of Treasure Gui (disabled) 2014-08-24 16:08:19 -05:00
Chiss 642f8b46b9 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-23 18:01:35 +10:00
Chiss af9bf0727a Fixed damage taken stat NPE
Added tournament team auto-rejoin
2014-08-23 17:55:28 +10:00
Jonathan Williams fd0c4745f8 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-23 00:40:17 -05:00
Jonathan Williams 931cb5ece8 Removed MineKart code.
Fixed up DisguisePlayer
Added ProfileLoader
Fixed up Notch gadget.
2014-08-23 00:40:07 -05:00
Chiss 0700b9df12 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-23 15:04:55 +10:00
Chiss 3ec43f90e8 GameAchievementManager now utilises TaskManager to record whether or not people have previously completed Achievements 2014-08-23 15:04:43 +10:00
Jonathan Williams a84468157c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-22 18:21:38 -05:00
Jonathan Williams ebb4c44bdc Tweaked player disguise. 2014-08-22 18:21:23 -05:00
Chiss 9fad775f73 More cosmetics 2014-08-23 07:50:07 +10:00
Chiss 11597285b8 Changed so it music will never be 'active'. 2014-08-23 05:36:57 +10:00
Chiss 2e031f1e4a Added Music Gadget 2014-08-23 05:35:07 +10:00
Jonathan Williams b67b2f04b7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-22 13:32:50 -05:00
Jonathan Williams 13b90e1142 Preliminary work on help desk integration with Customer Support server.
Updated DisguiseSheep with values from craftbukkit.jar
2014-08-22 13:32:22 -05:00
Chiss a159f04d50 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-23 04:30:52 +10:00
Chiss 231ef2bbe1 Cosmetic Update 2014-08-23 04:30:41 +10:00
Jonathan Williams 83b3e49151 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-22 10:48:27 -05:00
Jonathan Williams 70217fe957 Finished first release of Customer Support plugin. 2014-08-22 10:47:46 -05:00
Chiss 0022586e3e Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-22 17:08:29 +10:00
Chiss 97c087a28d Allowed commands to specify specific ranks
allowed youtube/build to start/set games
2014-08-22 17:05:14 +10:00
Jonathan Williams 99d15d3ece Work on Customer support server. 2014-08-21 15:55:09 -05:00
Jonathan Williams 830eeca835 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-20 20:14:32 -05:00
Chiss 60869d114e Dragon Escape changes 2014-08-20 15:45:10 +10:00
Jonathan Williams 217ab51b40 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-19 22:24:16 -05:00
Shaun Bennett a7bb84be0b Revert chris' revert 2014-08-19 21:24:49 -05:00
Shaun Bennett f60a818e6a Update craftbukkit to remove the extra _INVALID mappings 2014-08-19 21:22:04 -05:00
Jonathan Williams 24f984a365 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-19 21:37:11 -04:00
Jonathan Williams 9ee25c6292 Did some cleanup in Pvp project.
Did work in Coreclient manager and added StaffServer (still in progress)
2014-08-19 21:36:23 -04:00
Chiss 94e5eb03da Fixed errors for new getPlayers method. 2014-08-20 10:43:56 +10:00
Shaun Bennett e1a57a673e Update getOnlinePlayers() to recent bukkit changes, fixes IntelliJ errors 2014-08-19 16:58:55 -05:00
Jonathan Williams d73ffcccfd Added performance logging in ServerMonitor
Added date tracking for gem/coin/account transactions in preparation for Customer Support server.
2014-08-18 15:46:23 -04:00
Shaun Bennett 43fd604695 Queue up polls for players instead of constantly checking for next poll 2014-08-17 17:47:38 -05:00
Jonathan Williams 8aec9e345e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-16 01:37:17 -05:00
Jonathan Williams df97873d32 Fixed index issue with lobby balancer
Added performance output for server monitor.

Removed logging of debug stuff.
2014-08-16 01:37:06 -05:00
Chiss d8123795aa changed the way disguises show rank. 2014-08-16 16:33:18 +10:00
Chiss a888d4f14b Fixed leaks 2014-08-16 15:39:02 +10:00