Commit Graph

334 Commits

Author SHA1 Message Date
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