Commit Graph

334 Commits

Author SHA1 Message Date
Jonathan Williams 5bc7549b8c Disabled news because of console errors. 2014-07-19 14:48:05 -07:00
Jonathan Williams fc43f434f0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-19 13:56:30 -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
Peter Miller 944e7fca40 Finalizing BONUS clickable text hover text and News Entry issue overall.
Fixing bug with "/news set" command with insufficient command arguments.
2014-07-16 18:49:49 -04:00
Peter Miller d9110b4e3b Implementing BONUS: Clickable Chat Links. 2014-07-15 22:31:53 -04:00
Jonathan Williams cb4d436605 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-14 22:58:58 -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 2ec8371f98 Implementing /news add and delete commands. 2014-07-10 21:10:35 -04:00
Peter Miller 82ba7bf30f Implementing /news list and set commands. 2014-07-09 20:38:11 -04:00
Jonathan Williams 65b2e14689 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-09 11:15:06 -07:00
Jonathan Williams 193bd82b61 Minor adjustment to rule book. 2014-07-09 11:14:57 -07:00
Peter Miller f38af4ab8a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-08 22:56:02 -04:00
Peter Miller 58092c914a Initial database access and method stubbing for "news" command. 2014-07-08 22:55:51 -04:00
Jonathan Williams 74817f5f2e Added rule book to Hub.
Fixed mineplexer bungee internet status.

Fixed up ddosprotectionswitcher.
2014-07-08 18:01:03 -07: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 ff8c506690 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-04 23:23:30 -07:00
Mini-Chiss ce8560bdbf hub news 2014-07-04 23:20:46 -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
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
Jonathan Williams 8eaad57516 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-02 16:05:37 -07:00
Jonathan Williams f1393ffb33 Fixed rankUpdate changing existing higher ranked players.
Fixed join limits in arcade and hub.
2014-07-02 16:05:26 -07:00
Mini-Chiss 82dd94de9b Scoreboard fix
Unbreakable boats in hub
2014-07-02 12:50:04 -07:00
Peter Miller 6c67ff9106 Resolving issues from Portal.java conflict resolution 2014-07-02 04:09:41 -04: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
Mini-Chiss 8c461b3e1b Cooldown on Spec Compass
Hub Forcefield Update
Scoreboard MINEPLEX refactor
2014-06-30 16:12:42 -07:00
Jonathan Williams 7ff3765ba4 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-14 22:11:14 -07:00
Chiss 9a79d0ede7 Fixed CME
Gadget cost fix
MapParser fix
2014-06-15 15:10:19 +10:00
Jonathan Williams 04236939d6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-14 21:27:42 -07:00
Jonathan Williams 26e16e8eac Added button file. 2014-06-14 21:27:33 -07:00
Jonathan Williams 264248ecfa Added castle siege quick join menu button. 2014-06-14 21:27:21 -07:00
Chiss 1bfa24cc45 Fixed Fireworks crash bug & portal destroy bug;
-Only livingentities bounce off portals
-Fireworks cannot be used near portals
2014-06-15 12:35:09 +10:00
Chiss 2170f743dd Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2014-06-13 08:42:57 +10:00
Jonathan Williams be8fea8ca9 Changed Chat API key.
Fixed PreferenceManager not saving asynchronously.
2014-06-12 08:02:47 -07:00
Chiss 0be4df4531 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-06-11 12:14:45 +10:00
Chiss 6a1ffcd3b7 Fixed some gadget stuff 2014-06-11 12:14:21 +10:00
Jonathan Williams 4fca244812 Made ItemGadgets Free.
Removed queue dom shop.
2014-06-10 02:00:53 -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
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
Chiss 040ffe0ae5 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-06-01 17:56:27 +10:00
Chiss c2ce84c666 merge 2014-06-01 17:56:15 +10:00
Jonathan Williams 11862f672e Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
2014-06-01 00:54:15 -07:00
Jonathan Williams d0e9c41e22 Added moved pet stuff. 2014-06-01 00:53:15 -07:00
Jonathan Williams bd2804c0d6 Fixed some item slot numbers for gadgets. 2014-06-01 00:53:00 -07:00
Chiss 2a5f3c4502 antistack 2014-06-01 17:47:11 +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 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