Commit Graph

995 Commits

Author SHA1 Message Date
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
CoderTim ae6cb4aa22 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-15 15:56:44 -04:00
CoderTim 19222c6815 Updated IntelliJ environment to be compatible with latest changes 2014-08-15 15:51:29 -04:00
Ty 3c4c537998 Fix issue where broken Jedis instances were returned as functional instances. 2014-08-15 14:49:01 -04:00
Chiss 697897b967 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-15 09:49:12 +10:00
Chiss 85522cddca Debug (will clean once fixed)
Game stats
2014-08-15 09:49:00 +10:00
Jonathan Williams 846c75453c Revamping Redis Server status so it uses a consistent time value from redis database. 2014-08-14 07:41:04 -05:00
Jonathan Williams cacf736f4f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-14 04:10:21 -05:00
Jonathan Williams 682735e994 Added build fixes for ServerMonitor.java
Added redis fixes for ServerMonitor
Added ServerStatusManager fixes.
2014-08-14 04:10:11 -05:00
Chiss 74435bac12 fixed bug where players kept inventory open, to be able to enable morphs ingame. 2014-08-14 17:31:14 +10:00
Chiss c72f4b6057 Dragon target cancel fix 2014-08-14 12:35:49 +10:00
Chiss b21ae8ef72 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-14 10:32:52 +10:00
Chiss 7a3bba45a7 Mergey! 2014-08-14 10:32:41 +10:00
Jonathan Williams 27032ac2ed Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
	Plugins/Mineplex.Core/src/mineplex/core/portal/PortalRepository.java
2014-08-13 18:59:59 -05:00
Jonathan Williams 6039168601 Updated code base to build #1604 spigot 2014-08-13 18:57:37 -05:00
Ty 4b4f43ac16 Convert PortalRepository's redis host fetch to ServerManager constant, and remove debug code section. 2014-08-13 16:37:05 -04:00
Ty 1bbb42214d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-12 11:14:53 -04:00
Ty 5b059e96ca Commit missing PortalRepository.java file and finish clean() method. 2014-08-12 11:14:31 -04:00
Chiss 95394c51cc Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-12 11:24:12 +10:00
Chiss 2d67d4ce36 Achievement fix + active 2014-08-12 11:23:53 +10:00
Ty 36d6a58e0a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/GroupStatusData.java
	Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java
2014-08-11 15:39:56 -04:00
Shaun Bennett d63137ead2 Merge remote-tracking branch 'origin/master' 2014-08-11 12:44:28 -05:00
Shaun Bennett 4006c454c3 Change order of events when enabling a gadget (Fixes bug where switching gadgets while a gadget is enabled doesn't show up on gadget page) 2014-08-11 12:39:26 -05:00
Shaun Bennett 482b964580 Display particles when shouldDisplay() is true instead of false 2014-08-11 12:30:03 -05:00
Shaun Bennett 7e93ed657f Display boss bar properly while a dragon mount is spawned in arcade 2014-08-11 12:26:56 -05:00
Chiss 02270a9d25 TNT effect only triggers off self tnt. 2014-08-11 15:33:45 +10:00
Chiss e4871c4988 Disabling cosmetics 5s before game starts, was having some carryover due to lag. 2014-08-11 11:55:00 +10:00
Chiss 06bcf5079b Disabled Gem hunter (bugged?)
Disabled chicken morph letting people fly
2014-08-10 18:36:18 +10:00
Chiss 25b525837f Fixed TNT blowing up lobby when it changed to prepare. 2014-08-10 11:07:05 +10:00
Chiss 9057246ab8 Arcade Inventory fixes 2014-08-10 10:50:31 +10:00
Chiss 3533ce1b7e Particles dont play in stealth games. 2014-08-10 01:04:53 +10:00
Chiss 53221e267e Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-10 00:57:17 +10:00
Chiss 7aa017772f Spectators will not play particle effects
ALL rank no longer displays on morphs.
2014-08-10 00:55:51 +10:00
Jonathan Williams e50c179e8d Fixed pet tag price. 2014-08-09 09:49:00 -05:00
Jonathan Williams 43862ea6bf Moved Particles to Admin and up only. 2014-08-09 09:44:00 -05:00
Chiss 21b89d2771 removed particle debug 2014-08-09 23:36:36 +10:00
Chiss 59859b168f Fixed multi-morphs 2014-08-09 23:34:12 +10:00
Jonathan Williams 3ea2567079 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-09 07:41:09 -05:00
Jonathan Williams 9b75ef4f96 Fixed purchasing -2 cost gadgets. 2014-08-09 07:41:00 -05:00
Chiss 066dfbc9a9 Morph helmet fix 2014-08-09 22:38:58 +10:00
Chiss e558796268 fixed TNT not being able to hit anyone 2014-08-09 22:16:49 +10:00
Chiss a34ce75252 price fix 2014-08-09 22:02:40 +10:00
Chiss 6c847e78b7 Gem Hunter exp change 2014-08-09 20:16:21 +10:00
Chiss 06a444bae6 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-09 19:55:35 +10:00
Chiss ff6ea3c798 Added Cosmetics to Arcade
Set prices on cosmetics
2014-08-09 19:55:05 +10:00
Jonathan Williams b0f6435661 Fixed items not updating immediately. 2014-08-09 04:29:34 -05:00
Chiss 951e1df3d5 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-09 19:05:34 +10:00
Jonathan Williams 8fe4e39207 Split up Cosmetic shop and Inventory
Added Ammo purchase for item gadgets.
2014-08-09 03:57:56 -05:00
Chiss 62eccbcc1e Snr Mod
Creeper knockbak changes
2014-08-09 15:06:00 +10:00
Chiss 91a79f0345 Pig Morph
Morphs have tags/
2014-08-09 14:57:01 +10:00
Jonathan Williams 3f54881a3e Fixed multiple purchase of Gem Booster. 2014-08-08 23:06:16 -05:00
Jonathan Williams 6bd9273edf Refactored getting item count for ClientInventory
Fixed up Arcade gem boosters so they are hooked into inventory.
Cleaned up unused code.
2014-08-08 22:10:02 -05:00
Chiss db90bcc958 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-09 12:16:53 +10:00
Chiss 313f675ae4 Hub Parkour update
Smash kit prices
2014-08-09 12:16:37 +10:00
Jonathan Williams e7847cc495 Tweaked Gem booster description. 2014-08-08 20:50:07 -05:00
Jonathan Williams bed2545b04 Added back buttons for sub menus.
Added Gem booster pack and booster count display.

Added reason and admin to mute message

Fixed inventory tracking.
2014-08-08 20:48:15 -05:00
Ty ecb0b2d3bb Fix LobbyBalancer merge issue and convert PortalRepository to a redis-based system instead of MySQL. 2014-08-08 17:35:37 -04:00
Chiss 02dd579844 Text change for Inventory Menu 2014-08-08 17:16:20 +10:00
Jonathan Williams e1be732202 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/stats/StatsRepository.java
2014-08-08 02:07:20 -05:00
Jonathan Williams 9f2a83c956 Added Coins to donation.
Fixed order of gadgets, mounts, pets, morphs, particles.
Fixed display of active pet in Menu
Fixed coins purchase for most items.

Added Coins reward for ENjinTranslator.
Added Coin transactions.
2014-08-08 02:05:58 -05:00
Chiss fa3695be4e Gem Booster In Lobby
Achievement Stuff
2014-08-08 17:05:11 +10:00
Chiss 8f72ba4ab7 Hooked in statchangeevent 2014-08-08 13:53:58 +10:00
Chiss 1a33dbb5ee Achievement Module
Gem Booster/Achivement
2014-08-08 13:46:35 +10:00
Jonathan Williams e051c1d62c Work on inventoryManager and Enjin translator. 2014-08-07 21:22:18 -05:00
Jonathan Williams 5d89d1f728 Fixed gadget adding/removing from hotbar
Fixed stats manager _stats not initializing
Optimized saving call.
2014-08-07 01:46:10 -07:00
Jonathan Williams 2a31bbee95 Added new gadget stuff to core.
Hooked up particle page.
2014-08-07 01:20:19 -07:00
Jonathan Williams c01fbd279d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/gadget/GadgetManager.java
2014-08-07 00:48:32 -07:00
Jonathan Williams 055e4c5895 Converted PreferencesManager to RepositoryBase 2014-08-07 00:43:54 -07:00
Jonathan Williams 6d86f403ac Added coins Currency to web api
Added coins purchase for all cosmetic items
Added Stats manager
Added Inventory Manager

Redesigned gadgets/morph/particle/pets/mounts page and inventory.
2014-08-07 00:33:24 -07:00
Chiss c8dfb2f02e Parser Fixes
Sneaky Stuff
2014-08-06 11:07:49 +10:00
Ty 1b7c762942 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancer.java
	Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancerRepository.java
	Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/GroupStatusData.java
	Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/Repository.java
	Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerGroupData.java
	Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java
2014-08-04 18:47:49 -04:00
CoderTim 39e23c16f0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-04 00:00:12 -04:00
CoderTim ec48a59301 Added option DISGUISE_TYPE:<ENTITY_TYPE> in WorldConfig.dat for Sneaky Assassins to configure which entity players are disguised as. 2014-08-03 23:59:10 -04:00
Shaun Bennett 6d7e8072d5 Remove premium server restriction in ServerCommand 2014-08-03 13:41:14 -05:00
Ty 6a9255e97b Add new Mineplex.ServerData library for interfacing with the ServerRepository, and modify Mineplex.ServerMonitor, Mineplex.Bungee.Mineplexer and Mineplex.Core to integrate changes. 2014-08-01 17:56:29 -04:00
Jonathan Williams 53ce70488f Merge pull request #1 from premium-server-menu to master
* commit '95a45409a98c141a115e463e56e440b204ae2029':
  Use UtilPlayer and F.main for messaging
  Fix flashing clock (oops!)
  Sound effects and knockbacks!
  Flashing wool instead of clock for the timer
  Change duration of timer. Don't punish a party if the leader has ultra
  Lighten load on our servers, not free servers!
  Lore edit on clock item
  Place players on correct server corresponding to their rank via portals
  Visual clock update
  Fix lore messages not displaying correctly under certain circumstances
  Use constants for lore messages on server page
  Prevent free players from joining servers before time limit
  Deny joining Premium servers through server command without premium
  Fix "Click to Spectate" formatting
  Identify free servers from server name
  Add Server Menu for Premium Servers. Item lore still needs some work
2014-08-01 02:05:39 -05:00
Shaun Bennett c2b1f2a52f Deny joining Premium servers through server command without premium 2014-07-31 13:47:51 -05:00
Peter Miller fb0469adfa Chat filter API changes from TwoHat/PottyMouth to Inversoft/CleanSpeak. 2014-07-30 20:09:58 -04:00
Shaun Bennett dcc8eaaa21 Add Server Menu for Premium Servers. Item lore still needs some work 2014-07-30 17:19:51 -05:00
Jonathan Williams 1362deca59 More work on FriendManager 2014-07-19 13:56:21 -07:00
Jonathan Williams 2ae3d89496 Fixed issue with RepositoryBase and Friend/MysqlRepo
Each db call on login gets its own async after the first two account calls are finished.
2014-07-19 13:56:03 -07:00
Jonathan Williams 8b747a81e1 Fixed filter bypass 2014-07-19 13:53:14 -07:00
Jonathan Williams 3636255e8a Fixed bug with DisguiseManager undisguising players.
Temp fix for emeralds not triggering in Perk Revealer.
2014-07-14 23:48:34 -07:00
Jonathan Williams 1207ed8199 Added DDOSProtectionSwitcher email functionality
mineplex.core.Server cleanup.

Refactored RepositoryBase.

Implemented core functionality of Friends
2014-07-14 22:58:36 -07:00
Peter Miller 58092c914a Initial database access and method stubbing for "news" command. 2014-07-08 22:55:51 -04:00
Jonathan Williams 963c71f128 Fixed internet status stuff for bungees.
Fixed new portal arg req.
2014-07-08 12:44:17 -07:00
Jonathan Williams e6e86c2042 Updated DnsMadeEasy api.
Cleaned up some bungee code.

Added InternetStatus to Bungees.

Fixed some portal stuff.
2014-07-08 12:20:19 -07:00
Peter Miller ddf1a8ff74 Pointed "send" command to "AddTransferRecord" method in Portal module.
Corrected "serverTarget" to "playerTarget" in "Player...does not exist!" message.
Cleaned up unnecessary references.
2014-07-07 17:30:03 -04:00
Jonathan Williams a66e877028 Cleaned up Bungee mineplexer a bit.
Refactored send/server commands for Portal.
2014-07-05 10:56:20 -07:00
Jonathan Williams c882ab1b34 Fixed portal command stuff.
Removed temp code from PlayerTracker

Added temp project for future ddos prot switching.
2014-07-04 23:23:19 -07:00
Jonathan Williams e6666932aa Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-04 14:32:41 -07:00
Jonathan Williams c265c7ce5c Fixed sync db Logger.java
Added temp test code in player tracker...ignore.

fixed bug in dynamic server sorter.
2014-07-04 14:23:11 -07:00
CoderTim 2fb2aadf66 Merge remote-tracking branch 'origin/master' 2014-07-04 11:12:52 -04:00
Peter Miller b56855c33c Squished remaining concurrency/checking bugs! Happy 4th o'July! 2014-07-04 02:19:20 -04:00
Jonathan Williams d2caf23ed7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-03 11:19:23 -07:00
Jonathan Williams b058665e93 Fixed sync db calls for PlayerTracker
Fixed name update with new UUID

Skeleton work for Friends
2014-07-03 11:18:11 -07:00
Peter Miller 2531dd7a8f Implementing user/serverName checks 2014-07-03 00:17:49 -04:00
Jonathan Williams d0fafce585 Reverted change to helper only joining full, now ultras can.
Added check so BETA servers cannot be joined by less than Helper.

Fixed message in AccountAdministrator for rankUpdate
2014-07-02 16:59:31 -07:00
Mini-Chiss 558f79fe34 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-07-02 10:58:34 -07:00
Mini-Chiss 17c36026f6 fixed bug where player who comes first was not being added to ranks. (get nothing) 2014-07-02 10:57:30 -07:00
Peter Miller e7832fd06c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
2014-07-02 03:47:14 -04:00
Peter Miller 1f515565ff Moving improved server/send command code to separate command files 2014-07-02 03:24:48 -04:00
CoderTim 44a57a485f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-01 21:39:03 -04:00
Jonathan Williams 41c4d5a0a8 Changed joining full servers to helper+ 2014-07-01 18:33:33 -07:00
Jonathan Williams 6fd889d8fc Added Player mapping.
Removed joining full servers for ultra.
2014-07-01 18:31:17 -07:00
Jonathan Williams b627e8fdf5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-01 10:25:12 -07:00
Jonathan Williams 9fd3f14248 Added RankUpdate command.
Fixed Lobby joinable issue with server monitor.
Changed server monitor to be fully dynamic for us.
2014-07-01 10:23:22 -07:00
CoderTim 7ea818c0c8 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-01 02:20:45 -04:00
Mini-Chiss 7bc3966feb Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-06-30 16:13:15 -07:00
Mini-Chiss 8c461b3e1b Cooldown on Spec Compass
Hub Forcefield Update
Scoreboard MINEPLEX refactor
2014-06-30 16:12:42 -07:00
Jonathan Williams 8e8e66f8c1 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-27 20:25:09 -07:00
Jonathan Williams 0287cfb2f6 Refactored Punish a bit so punishments don't expire early or jack up based on server's time. 2014-06-27 20:24:44 -07:00
CoderTim ccb17d5ac3 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-27 19:33:34 -04:00
Peter Miller 60a6f22194 Added functionality for retrieving serverName from Bungee 2014-06-27 17:01:54 -04:00
Jonathan Williams 210264f25b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-25 20:53:39 -07:00
Peter Miller e25101cd59 Continued enhancements... 2014-06-25 20:28:27 -04:00
Jonathan Williams f6ad5c5549 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-25 12:07:49 -07:00
Jonathan Williams 4f3ffde892 Added timing/debugging code. 2014-06-25 12:06:24 -07:00
Peter Miller bb5aa8e0f3 Work on /server and /send commands with permissions (more permissions need to be implemented). 2014-06-24 22:34:17 -04:00
Mini-Chiss 46849745c4 Champions TDM Update 2014-06-23 16:20:50 -07:00
Jonathan Williams 93fbe70e9c Added more loggingggggg. 2014-06-15 17:21:40 -07:00
Jonathan Williams 0f7885d911 Added safety checks in ClientManager
Added logging and teampreference swap fix in arcade.
2014-06-15 16:25:32 -07:00
Jonathan Williams 336c307732 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-12 08:03:02 -07:00
Jonathan Williams be8fea8ca9 Changed Chat API key.
Fixed PreferenceManager not saving asynchronously.
2014-06-12 08:02:47 -07:00
Peter Miller 01fbda81ba More suggested improvements; commented out getEntries method for now. 2014-06-11 02:35:44 -04:00
Peter Miller 63f082b424 Implementing suggested code style/locking changes and recommitting (JIRA-76) 2014-06-10 16:09:33 -04:00
Jonathan Williams 0bf702902e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-08 11:28:25 -05:00
Jonathan Williams 3ae119d88a Fixed hub package unlock bug.
Fixed Champions build page open bug.

MOved some code around because i'm a boss.
2014-06-08 11:27:14 -05:00
Peter Miller 77dad4b475 JIRA-76: SimpleStats Manager/Repository creation 2014-06-06 09:52:26 -04:00
Chiss a8dda4ef8b Hub Gem Queueing 2014-06-04 13:02:16 +10:00
Chiss f2d1709adb Hub update 2014-06-01 18:18:58 +10:00
Jonathan Williams 461e1023e3 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-06-01 00:39:28 -07:00
Jonathan Williams f157715174 Merged Pet page into Gadget page.
Reworked gadget page.
2014-06-01 00:39:10 -07:00
Chiss 37c5654e13 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2014-06-01 15:50:11 +10:00
Chiss a3a3a87278 Hug update 2014-06-01 15:47:34 +10:00
Jonathan Williams 7f87043f7b Removed unused buttons.
Fixed pref inv placement.

Refactored queue code so its not stupid.

Fixed issue with queuer.
2014-05-31 22:46:43 -07:00
Jonathan Williams 6505819a4b Removed chat filtering.
Implemented user preferences in all required modules.
2014-05-30 13:34:55 -07:00
Jonathan Williams 57c3845df9 Finished up preferences.
Each preference saves, loads on login.
GUI working great.
2014-05-30 01:42:43 -07:00
Jonathan Williams 77f6aac860 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-30 00:26:34 -07:00
Jonathan Williams b8908ada4b Removed unused connection info in RetrieveClientInformationEvent
Added required method for miniclientplugin
Implemented Preferences module...repo/manager/gui
2014-05-30 00:25:48 -07:00
Chiss 937f5d8ef2 Hub stuff 2014-05-30 17:17:53 +10:00
Jonathan Williams c38e60456b OMG THIS THING IS SO COMPLICATED MY BRAIN FIZZZLED...fixed some queuer issues.
Fixed bug with forcefield in hub.

Fixed symbol for connecting to dbs in connection strings.
2014-05-29 19:47:57 -07:00
CoderTim fbf59ace67 Fixed server status connection url 2014-05-28 19:13:10 -04:00
CoderTim 1b5b2d21b2 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-28 17:51:38 -04:00
Jonathan Williams 0d350da6c0 Added more files and updated ignore list. 2014-05-28 11:23:32 -07:00
Jonathan Williams d5ea6c5377 Removed dead project ServerStatus
Tweaked connection strings so they autoreconnect.

Added dragon sound to pre-queue prompt.

Added rest of missing files.
2014-05-28 11:18:30 -07:00
Jonathan Williams 24ccf133af Fixed bug with Portal where it continuously sent players until queue cleaned up records 15 seconds later. 2014-05-28 10:43:39 -07:00
CoderTim 94e31e36f8 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-27 21:42:01 -04:00
CoderTim e101c027ce Created Sneaky Assassins and started work on the kits 2014-05-27 21:38:22 -04:00
CoderTim 091166f090 Refactored disguises to use EntityType 2014-05-27 17:49:45 -04:00
Jonathan Williams 449fa13cc3 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
Conflicts:
	.gitignore
2014-05-27 02:23:22 -07:00
Jonathan Williams 0634ee5543 Removed unused global stuff in Mineplexer.
Did some edits in GroupManager...need to pick that up.

Changed TimeUtil to pop last entry when stopping.
Fixed WorldUtil's dimension thing for UHC.
Fixed Exception with AntihackRepository and no static lock object on _connection

Work on Elo manager.
Work on Queue.

Added checking for player to server transfer records.

Added option for rejoin time in TeamGame (UHC...yay)
2014-05-27 02:10:29 -07:00
CoderTim 49de140f41 Configured eclipse to use UTF-8 2014-05-25 21:04:14 -04:00
CoderTim c45e7d2a80 Converted file encoding from ISO-8859-1 to UTF-8 2014-05-25 19:42:39 -04:00
CoderTim aa6b5324eb Set up IntelliJ IDEA 2014-05-20 00:39:50 -04:00
Peter Miller e0dd0116a2 Beginning changes for stats from PlayerName to PlayerUUID 2014-05-06 17:06:19 -04:00
Jonathan Williams a9d3d31339 Fixed memory problem with CraftingManager and arcade worlds that should be unloaded but are still referenced. 2014-05-06 09:14:31 -07:00
Jonathan Williams 56c0545659 Added elo files. 2014-05-06 09:08:22 -07:00
Jonathan Williams 8110506ac4 Fixed duplicate login issue with CoreClientManager
Added EloRanking and EloStart for elo games in Game.java

Refactored Elo code in Arcade to be based off of above values in Game

Changed Lobby scoreboard in Arcade to just Players at top current/max.
2014-05-06 09:06:39 -07:00
Jonathan Williams 2f397e7d2a Work on elo manager.
implemented coreclient cleanup.
2014-05-04 22:40:44 -07:00
Jonathan Williams 97e083c1e7 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-04 12:52:14 -07:00
Jonathan Williams f623026dfc Fixed projectile order issue..check for dead before collision.
Fixed dead chunks in Aracde.
2014-05-04 12:52:04 -07:00
Chiss 3c2fc4c49b Fixed MAC not being disabled 2014-05-03 17:29:55 +10:00
Jonathan Williams 0101531291 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2014-05-02 23:15:08 -07:00
Jonathan Williams 484ba97b23 Updated file delete mechanism so there is no reflection.
Removed list block on deleting players from coreclient quit.
2014-05-02 23:12:39 -07:00
Chiss 4304327bf9 Disallowed /spec during games. 2014-05-03 13:06:15 +10:00
Chiss 395a5d2c08 MAC disabled with Tournament Mode
Bridges TM game desc fix
2014-05-03 11:47:15 +10:00
Chiss 1d4d98b910 Twitch Prep
MAC changes
2014-05-02 14:35:41 +10:00
Chiss c1360c63f0 More strikes for auto-kick
Updated MAC kick message
2014-05-01 09:38:37 +10:00
Chiss a17c1aca44 Allow more for lag in MAC 2014-05-01 09:36:30 +10:00
Chiss 8240101d60 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java
2014-05-01 09:33:59 +10:00
Chiss 423a355057 Helpers+ wont be kicked yb MAC 2014-05-01 09:31:47 +10:00
Jonathan Williams f4a92ec07a Implemented Logger
Logger now catches all uncaught exceptions and logs them to DB.

Put in some preventative checks in Hub/Party as they threw a lot of the same errors.

Added autoreconnect to AntiHack as it was spamming errors in DB
2014-04-30 10:57:19 -07:00
Jonathan Williams 7637d94ae0 Added mysql logger.
Hooked it up in a few places.

Fixed Asynch crap with AntiHack.
2014-04-30 00:31:22 -07:00
Jonathan Williams 42e9fe879c Fix for party filtered party messages going to everyone. 2014-04-29 13:45:38 -07:00
Jonathan Williams e958a922fe Fixed Hub chat so it goes through filter.
Added back in server name so it tracks correctly.

Fixed PlayerCount in Mineplexer AGAIN.
2014-04-29 12:53:22 -07:00
Jonathan Williams cee2883786 Added some verbage around command center block.
Fixed async chat connection stuff.
2014-04-29 12:13:32 -07:00
Jonathan Williams 3ec1653532 Added in chat filtering command and finished up filtration. 2014-04-29 11:54:20 -07:00
Jonathan Williams 1bcdc71c14 Added ping logging to Antihack reports. 2014-04-28 01:53:02 -07:00
Jonathan Williams fd372b8418 Changed skills to 2k gems each.
Changed power/booster to 2k gems each.

Added AntiHack perm storage of kicks.
Commented out SafeChat stuff for now.
2014-04-28 01:05:08 -07:00
Jonathan Williams 66aa7223cc Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-27 21:59:35 -07:00
Jonathan Williams 47417dea6b Implemented initial SafeChat. 2014-04-27 21:59:18 -07:00
Chiss 77809b409d MAC Update 2014-04-28 12:28:48 +10:00
Jonathan Williams 7c9017f184 Fixed Bungee issue with ServerPing in MOTD.
UPdated to latest spigot again.

Removed useless 1.7 stat tracking.

Fixed Party issue in hub
2014-04-26 02:47:04 -07:00
Jonathan Williams 9136fa0b15 Upgraded to latest spigot.
Fixed npcs being so loud.
Npcs are now ghosted automatically.

Added UUID on login.
2014-04-25 00:44:14 -07:00
Chiss b8e573e8f8 redid capture display. much less annoying. 2014-04-21 11:15:49 +10:00
Jonathan Williams 458f5741d7 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-19 20:54:04 -07:00
Jonathan Williams e5e9cc7284 Custom Items in custom Builds for dom. 2014-04-19 20:53:55 -07:00
Chiss de2b42e190 fixed tnt bug 2014-04-19 15:18:13 +10:00
Chiss b720a6433c Explosions crack carved stone brick 2014-04-19 15:10:30 +10:00
Chiss 081da93bbd blocked /bukkit:me 2014-04-13 11:19:16 +10:00
Chiss f25a6c26c9 Champs Update 2014-04-13 11:06:10 +10:00
Jonathan Williams 1cb35262ac Fixed skill tokens not being returned. 2014-04-12 14:02:40 -07:00
Jonathan Williams 8f42d91d8a Fixed ban kick bug.
Fixed Hub right click mount crash bug.
Fix for custom builds not saving.
Fixed Bridges not starting/hanging.

Updated to 1.7.8 spigot support.

Removed logging on HS.
2014-04-12 01:28:33 -07:00
Chiss 80df2c2944 Bux fixes for 1.7
Champions TDM
SSM Domination
2014-04-11 15:33:31 +10:00
Chiss 71b2931936 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-04-11 10:34:51 +10:00
Chiss 2adf0395a1 Merge 2014-04-11 10:33:56 +10:00
Jonathan Williams 0375384fb5 Converted to Spigot's latest 1.7.5 2014-04-10 17:15:44 -07:00
Jonathan Williams a26894fda6 Added missing file. 2014-04-09 21:38:12 -07:00
Chiss 85c57f2942 IButton now has Left/Right
Added right-click skill removal.
2014-04-06 12:45:52 +10:00
Jonathan Williams ddcc8a26b3 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-04 15:02:42 -04:00
Jonathan Williams edfe23fb01 Fixed collision with Projectiles. 2014-04-04 15:02:13 -04:00
Chiss 13b8f1e7ea Champs Update 2014-04-04 13:26:00 +11:00
Chiss 26fe974b00 More CHamps 2014-04-03 15:48:58 +11:00
Chiss 80c153095b Cooldown bar 2014-04-02 22:03:56 +11:00
Chiss 2f0167ea09 Champs Update 2014-04-02 21:22:21 +11:00
Chiss 2aaf749414 Champions Update 2014-04-02 15:19:58 +11:00
Jonathan Williams afc26e21e3 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-03-29 18:46:52 -04:00
Chiss 0f937b165c skill shop stuff 2014-03-30 09:45:53 +11:00
Jonathan Williams d227a6bd06 Changed full server message 2014-03-29 18:45:44 -04:00
Chiss fce249d7d8 fixed some desc stuff
castle seige removed OP kit
2014-03-28 18:50:38 +11:00
Chiss f5ca6408f8 Merge? 2014-03-28 14:51:26 +11:00
Jonathan Williams 17e6658437 Fixed up AntiHack database reporting. 2014-03-24 01:16:02 -07:00
Jonathan Williams 8bf78fe14d Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-03-21 15:30:06 -07:00
Jonathan Williams 33d342b049 updated 1.7 stuff. 2014-03-21 10:57:31 -07:00
Chiss ab2a72ba16 CS Update 2014-03-21 11:59:56 +11:00
Jonathan Williams f24f81b7c3 Finished conversion. 2014-03-19 04:09:40 -07:00
Jonathan Williams 7042159f46 Updated to 1.7 and changed namespaces to 1.7 2014-03-19 02:24:26 -07:00
Jonathan Williams de1365b5cf Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-03-13 17:56:16 -07:00
Jonathan Williams efee9fdcbf Fixed Hub class shop.
Added chat logging.
Added message with file updater.
2014-03-13 17:56:05 -07:00
Chiss 82644002c5 A little bit o dem ol bug fixles. yknow what im sayin? 2014-03-13 16:32:48 +11:00
Jonathan Williams a565da45e4 Added classes to champions.
Added ability to open direct classes page.
2014-03-09 19:32:27 -07:00
Jonathan Williams f51a6747fd Moved files into Mineplex.core
Removed references to Core project.
2014-03-09 00:50:13 -08:00
Jonathan Williams d99a3c9253 Optimized mysql queries with server status' address/updated fields.
Removed double gems.
Added BETA check for Hero only beta games.
2014-03-03 12:47:57 -08:00
Jonathan Williams b3f10b9d62 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2014-03-01 01:59:25 -08:00
Chiss bfaa138526 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2014-03-01 10:35:20 +11:00
Chiss 7cf6391ddd Sheep Quest
Double Gem Weekend
2014-03-01 10:35:06 +11:00
Jonathan Williams 8550307904 Removed unnecessary mysql call on client login. 2014-02-28 13:22:30 -08:00
Jonathan Williams c2044f7e8a Added horse disguise.
Added Hub redirect on full.
Fixed Repo for ServerMonitor.
Fixed Bridge QuitOut/AutoBalance issue.

Removed unnecessary region folder create in dominate.
2014-02-28 01:18:32 -08:00
Jonathan Williams f2570caad5 Swapped default connections to new dns names.
Fixed bug with LobbyBalancer and retrieving no lobbies.
2014-02-21 13:32:14 -08:00
Jonathan Williams a75ced170c Added whitelist check in CoreClientManager 2014-02-10 02:04:20 -08:00
Chiss e124dde006 Finished Gravity
INcluded map
2014-01-21 22:48:18 +11:00
Jonathan Williams 0fba94f8ae Derp 2014-01-20 20:22:59 -06:00
Chiss 76b2baf626 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2014-01-21 11:28:37 +11:00
Chiss 7bbfdd1a42 Gravity Update 2014-01-21 11:28:12 +11:00
Jonathan Williams dea96a9e65 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2014-01-18 09:08:12 -06:00
Jonathan Williams 177f4a878b Removed bad eventhandler line
Refactored StatsManager
Removed Pvp Table add for StatsManager
Added commented out hooks for HG stats
2014-01-18 09:02:56 -06:00
Chiss 75669e2333 Hub News Changes
AntiHack Autokick for Severe Hackers
2014-01-18 20:33:38 +11:00
Chiss 1031846198 SSM Update
Gravity game start
2014-01-18 12:34:24 +11:00
Jonathan Williams ea320e7f5b Removed Client cleanup.
Modified server monitor process handling.
2014-01-08 15:18:52 -05:00
Jonathan Williams 6904f9cf3d Minor verbage "Starting in 1 Second."
Fixed NPE in client cleanup.
2014-01-03 05:50:05 -05:00
Jonathan Williams 93c0575fe2 Fixed naming in some hub modules.
Fixed StatusManager ip and DynamicServer comparison.

Tweaked Bungee Lobby selection so it doesn't select a Lobby with < 10 slots left
Added client cleanup in CoreClientManager
Added Paintball cleanup
Added AntiHack ignore list cleanup.
Added clearDisguises call in DisguiseManager
Added ServerMonitor tracking based on Private Address.
2014-01-03 01:37:39 -05:00
Jonathan Williams dd7b178a9f Fixed Hero rank in EnjinTranslator 2013-12-26 19:44:36 -05:00
Chiss d92515eef9 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-12-24 19:14:54 +11:00
Chiss 74e49a3ff1 Hero Rank stuff
New SSM Kit
2013-12-24 19:14:40 +11:00
Jonathan Williams 6595d33899 Tuned chunk load for disguise manager.
Disabled dynamic text in hub.
2013-12-24 00:39:33 -05:00
Jonathan Williams 79de7f2bfc Fixed portal breaking with Frost horse.
Added memory clean up for disguises
2013-12-23 04:16:53 -05:00
Chiss bfd76474e8 Dragon particles 2013-12-21 20:44:56 +11:00
Chiss c969775df3 Hub gadgets for xmas 2013-12-21 19:00:30 +11:00
Jonathan Williams 64dab19003 Cleanup
Prep work on leash disable functionality.
2013-12-18 04:48:16 -05:00
Chiss c582b210b5 Hub + Stats + Tournament 2013-12-14 16:51:08 +11:00
Chiss 3ca67d60c0 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-12-14 16:38:46 +11:00
Chiss 9af8676307 Hub/Stats 2013-12-14 16:38:16 +11:00
Jonathan Williams ac049e0397 FINE JUST FINE>>>>>> STUPID CHICKENS 2013-12-13 21:36:57 -08:00
Jonathan Williams 69fa9eaba5 Added getters for stats/StatsManager.java 2013-12-13 21:35:04 -08:00
Jonathan Williams e054b06cc2 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-12-13 21:01:08 -08:00
Jonathan Williams 6b92b6c4a8 Added stats manager.
Added lots of missing files.
2013-12-13 21:00:56 -08:00