Commit Graph

334 Commits

Author SHA1 Message Date
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 6c9a2d0a01 Hooked up preference manager to Chat. 2014-05-30 00:33:55 -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
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 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 3859a42f1d Removed broken and obsolete shifter code
Set up more intellij stuff
2014-05-25 19:11:58 -04:00
CoderTim aa6b5324eb Set up IntelliJ IDEA 2014-05-20 00:39:50 -04:00
Jonathan Williams 40ba1a64f8 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-13 14:46:15 -05:00
Chiss 97abe79ffa armorgadgets disable fix 2014-05-13 12:23:29 +10:00
Chiss 8c3deeba49 Hub Commands (/forcefield and /gadget) 2014-05-13 12:08:56 +10:00
Jonathan Williams 8ee52be8da Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-08 20:01:31 -07:00
Jonathan Williams eae2d41fad Fixed party out of bounds exception.
Fixed tnt in wrong place in dom shop.
2014-05-08 20:01:21 -07:00
Chiss 56ae8627f5 news changes 2014-05-09 12:58:29 +10:00
Jonathan Williams ebf40afe75 Fix dom bow shoot in lobby bug.
Work on preventing illegal builds.
2014-05-06 22:38:27 -07: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 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 3ec1653532 Added in chat filtering command and finished up filtration. 2014-04-29 11:54:20 -07:00
Chiss c5509f870f Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-04-28 09:43:18 +10:00
Chiss 40ef432211 Cannot use skills/items in HubManager
Dom CP score rate lowered
Dom items dont use energy
2014-04-28 09:41:00 +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 a37ace7576 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-25 00:44:27 -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 8229925fca HUB NEWS 2014-04-25 17:37:42 +10:00
Jonathan Williams 0375384fb5 Converted to Spigot's latest 1.7.5 2014-04-10 17:15:44 -07:00
Jonathan Williams bedabd84cc Added silence to kits (UtilEnt.silence)
Cleaned up a ton of unused code....
2014-04-08 23:31:32 -07:00
Chiss 85c57f2942 IButton now has Left/Right
Added right-click skill removal.
2014-04-06 12:45:52 +10:00
Chiss 8214e3b8f4 Lots of little bug fixes 2014-04-05 16:52:23 +11:00
Chiss 26fe974b00 More CHamps 2014-04-03 15:48:58 +11:00
Chiss 2aaf749414 Champions Update 2014-04-02 15:19:58 +11:00
Jonathan Williams aae40d3899 Changed up Skills and SkillsPage for Dom 2 changeover.
Fixed CustomBuild stuff.
2014-03-27 22:17:31 -04:00
Jonathan Williams 17e6658437 Fixed up AntiHack database reporting. 2014-03-24 01:16:02 -07: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 246f28a464 Enabled DoubleGem weekend.
Added 3 new maps
updated news
2014-03-14 02:19:52 -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
Jonathan Williams f51a6747fd Moved files into Mineplex.core
Removed references to Core project.
2014-03-09 00:50:13 -08:00
Jonathan Williams d05c2f906c Fix for ServerNpc page beta join.
Work on Dom 2.0

Added sheep quest map.
2014-03-06 02:15:16 -08:00
Jonathan Williams f0b347f97f Changed beta testing to Ultra and up.
Did some work on DOM 2.0
2014-03-05 00:34:20 -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
Chiss 8d0115f874 News update 2014-03-01 10:40:55 +11: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 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 8e51e4061a Reverted Hub.
Fixed server monitor issues.
2014-01-14 02:04:06 -06: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
Chiss f510083e7e formatting 2013-12-24 19:26:30 +11:00
Chiss d25487d545 Rank color 2013-12-24 19:21:21 +11: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 592d49e57c Added ghost check flag to ender dragon.
Re-enabled Dragon Gadget.
2013-12-24 03:09:15 -05: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
Jonathan Williams a02ca4513e Added undead/batgun and frost to in game shop for gems. 2013-12-21 07:29:04 -05:00
Chiss e94784a908 dragon mount removed 2013-12-21 23:09:49 +11:00
Chiss c08b7c7b96 hub news update 2013-12-21 22:21:16 +11:00
Chiss bfd76474e8 Dragon particles 2013-12-21 20:44:56 +11:00
Chiss 0585116e78 Hub Gadgets
Hub Dragon (Hero Only)
XMAS block efficiency
2013-12-21 20:05:42 +11:00
Chiss c969775df3 Hub gadgets for xmas 2013-12-21 19:00:30 +11:00
Chiss c52a7d2fe1 Christmas update
Hub Update
2013-12-21 15:06:01 +11:00
Chiss bc9c309aa1 Xmas Game 2013-12-21 10:17:22 +11:00
Jonathan Williams 44145e01f0 Removed weather for hub update. 2013-12-18 13:52:44 -05:00
Jonathan Williams a24e8e233c Enabled pvp in hub for snowballs. 2013-12-18 05:56:59 -05:00
Jonathan Williams e55885c85d itsy 2013-12-18 05:22:40 -05:00
Chiss 54f2cb3467 Christmas hub snowman target cancel 2013-12-18 19:58:39 +11:00
Chiss de99a642d3 Hub tourney text removal 2013-12-17 11:06:04 +11:00
Chiss 4bef100c6a Xmas Hub 2013-12-16 14:32:51 +11:00
Chiss c582b210b5 Hub + Stats + Tournament 2013-12-14 16:51:08 +11:00
Chiss 9af8676307 Hub/Stats 2013-12-14 16:38:16 +11:00
Jonathan Williams 6b92b6c4a8 Added stats manager.
Added lots of missing files.
2013-12-13 21:00:56 -08:00
Jonathan Williams d6544202f0 Added ghost ability for mobs. 2013-12-12 02:19:58 -08:00
Jonathan Williams 03627eb0c3 Changed all mysql connections to be persistent. 2013-12-06 01:57:09 -08:00
Chiss f4e3b6efdc hub news/skytext for draw game 2013-11-30 22:11:26 +11:00
Jonathan Williams e04815f077 Removed Beta ultra only checking in server NPc page. 2013-11-23 02:40:56 -08:00
Jonathan Williams b0bfa860c7 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-23 02:04:30 -08:00
Jonathan Williams ae779d063e Added quick menu buttons for Block Hunt and Survival Games 2013-11-23 02:04:22 -08:00
Chiss f299b4f650 hub changes 2013-11-23 20:55:01 +11:00
Jonathan Williams 11378f967f Fixed npc page ultra beta stuff. 2013-11-23 00:39:32 -08:00
Jonathan Williams affc9eeb9c Added inventory click for creative users in Hub
Added Ultra/Survival games beta stuff do servernpcpage
2013-11-22 14:17:00 -08:00
Jonathan Williams 9e8cd9db7d Disabled painting in parkour areas. 2013-11-21 12:38:16 -08:00
Jonathan Williams 44416001b3 Disabled Bat Blaster near Parkour.
Disabled Painting blocks near cactus.
2013-11-21 12:16:24 -08:00
Jonathan Williams be7ea65033 Website bin/obj cleanup
Fixed Pet Rename problem.
Fixed Extra Pet tag problem.

Added ServerStatus for dedicated servers.
2013-11-21 12:08:58 -08:00
Jonathan Williams 0fa953715e Fixed interact cancel in Hub. 2013-11-16 18:49:17 -08:00
Chiss be4de5f7bb Europe server in news 2013-11-17 10:59:02 +11:00
Jonathan Williams 3a725246dc Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-16 02:59:35 -08:00
Jonathan Williams c1de12a8e7 Added autoreconnect to bungee repos
Fixed up disguise for block hunt.
2013-11-16 02:59:28 -08:00
Chiss 07d9610bf7 Hub sky text 2013-11-16 21:21:04 +11:00
Chiss 2a9c11d700 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-11-16 21:10:23 +11:00
Chiss 1e0a456286 hub changes 2013-11-16 21:09:59 +11:00
Jonathan Williams a9241bc7f3 Changed Hub to normal. 2013-11-16 02:07:51 -08:00
Jonathan Williams 75c2a5fd6e Added sound disguises
Removed purchasable batgun.
2013-11-16 01:55:10 -08:00
Chiss 255307088c Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
2013-11-09 10:03:49 +11:00
Chiss 3c5b1fe74f H&S Updates
some punish fixes
hub toggles no longer pulse on pressure plate
2013-11-09 09:48:40 +11:00
Jonathan Williams 079a58d2cd Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-06 20:38:41 -08:00
Jonathan Williams f8567dcfa6 Fix for scoreboard uppercase issue in hub. 2013-11-06 20:38:33 -08:00
Chiss 6b577af7b4 Punish Update
H&S Additions
2013-11-07 15:25:46 +11:00
Chiss 0d5b174ebe Stacker/Party exceptions for YouTubers 2013-11-07 10:33:39 +11:00
Chiss 9f11352f10 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-11-07 10:19:30 +11:00
Chiss 03731de7f8 Rank changes
MAC no longer kicks lag/fly
some H&S stuff :O
2013-11-07 10:18:36 +11:00
Jonathan Williams 6999d7979f Added paintball to LobbyMenu
Fixed Lobby count in lobby menu
Fixed ultra/green kits in Paintball
2013-11-02 12:26:28 -07:00
Chiss 1545873f62 news feed for hub 2013-11-02 18:56:21 +11:00
Chiss 24723cd5e5 paintball update 2013-11-02 10:09:07 +11:00
Jonathan Williams bac425235d Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-30 20:26:08 -07:00
Chiss 386e2e3067 Added Champs
MAC update
2013-10-31 09:45:11 +11:00
Jonathan Williams a307a4854f Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-28 18:45:19 -05:00
Chiss ad487e48bd THIS IS HALLOWEEN THIS IS HALLOWEEN 2013-10-29 10:41:53 +11:00
Jonathan Williams c70b5c712b Fixed crash items in Server Game Menu for Hub 2013-10-28 08:52:32 -05:00
Jonathan Williams afee32257d Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-28 02:22:30 -05:00
Jonathan Williams 4306d2444f Updated bungee library
Fixed server ping Event.java
Removed crash item in hub.
2013-10-28 01:37:23 -05:00
Chiss 980b6420fe fixed stacker item for 1.7 2013-10-28 15:48:06 +11:00
Chiss 505dd57715 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-27 15:25:12 +11:00
Chiss 4974fc17aa Halloween balance (slightly easier)
Giant hitbox improved
2013-10-27 15:24:28 +11:00
Jonathan Williams 0aee445e00 Added timeout check for status retrieval 2013-10-26 16:36:48 -05:00
Jonathan Williams 1781ed15c4 Fixed some drop item stuff. 2013-10-26 12:02:18 -05:00
Jonathan Williams 95449fec26 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-26 11:06:19 -05:00
Chiss 64e98c4a30 text now has glowstone behind it (for darkness) 2013-10-27 03:05:19 +11:00
Jonathan Williams 7d8e79a234 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-26 11:01:22 -05:00
Jonathan Williams 88eab4b1a3 Fixed gadget item slot.
Fixed some desc on mounts
2013-10-26 11:01:01 -05:00
Chiss d4affc8bb6 paintballs wont change near portals. 2013-10-27 02:53:38 +11:00
Jonathan Williams df36145800 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/gadget/types/ItemGadget.java
	Plugins/Mineplex.Hub/src/mineplex/hub/mount/types/Mule.java
2013-10-26 10:47:14 -05:00
Jonathan Williams 0b0fa383f6 Finished up Gadget shop. 2013-10-26 10:45:41 -05:00
Chiss 55de25fded removed testing toggle for mount
changed item gadget slot from 2 to 3
2013-10-27 02:22:38 +11:00
Chiss 19e2946ce4 mule rename 2013-10-27 01:44:18 +11:00
Jonathan Williams 9bc9cc2bb8 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/Halloween2013_BatGun.java
	Plugins/Mineplex.Hub/src/mineplex/hub/gadget/gadgets/Halloween2013_Helmet.java
	Plugins/Mineplex.Hub/src/mineplex/hub/gadget/types/ArmorGadget.java
	Plugins/Mineplex.Hub/src/mineplex/hub/gadget/types/Gadget.java
	Plugins/Mineplex.Hub/src/mineplex/hub/gadget/types/ItemGadget.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/creatures/MobGhast.java
2013-10-26 08:53:38 -05:00
Jonathan Williams 39cf5c3ed1 Tweaking on ghast.
Added gadget costs
Working on Gadget shop.
2013-10-26 08:50:12 -05:00
Chiss 7eb1cc6519 Halloween game additions 2013-10-27 00:06:44 +11:00
Chiss 723b57cd46 Added paintball gun Gadget
Added bat blaster Gadget

Halloween Game near-completed

Added SSM Witch
2013-10-26 19:01:26 +11:00
Chiss 49e8c15f44 important update 2013-10-25 22:56:28 +11:00
Chiss b74b8e3915 Halloween event changes 2013-10-25 21:25:23 +11:00
Chiss 5563d94111 Halloween event update
hub News
hub mounts
hub gadgets
2013-10-25 19:20:14 +11:00
Chiss 1977572ced Added Halloween Minigame
Updated gadgets and other minor things.
2013-10-22 15:46:31 +11:00
Chiss 7cec55713c Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-19 16:52:27 +11:00
Chiss 1944c0003c Hub gadgets 2013-10-19 16:52:15 +11:00
Jonathan Williams 90fbc397ff Converted gem rewards to boolean return from website.
Implemented gem transactions and source.
2013-10-18 00:46:06 -07:00
Jonathan Williams f88c202e07 Added AntiHack to Arcade/Hub
Added AntiHack Offense uploading.
Fixed memory leaks in PreparedStatments
Added Ultra tag in hub chat.
2013-10-17 00:37:57 -07:00
Jonathan Williams 25dec6fb46 Fixed player arm animation bug.
Added EnderDragon AI control and vegetation
2013-10-12 20:31:43 -07:00
Jonathan Williams e723075298 Increased lobby menu size.
Fixed memory leak in Explosion
2013-10-12 02:52:35 -07:00
Jonathan Williams 03c74aa419 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-12 01:55:52 -07:00
Jonathan Williams 42b932e612 Added inventory move prevention for all inventories
Prevent bone from being turned into bonemeal and being fed to pet wolf.
Fixed Dominate shop in hub.
2013-10-12 01:55:32 -07:00