Commit Graph

466 Commits

Author SHA1 Message Date
Jonathan Williams 48975d02c7 Adding some missing files for website. 2014-05-28 11:20:13 -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 c45e7d2a80 Converted file encoding from ISO-8859-1 to UTF-8 2014-05-25 19:42:39 -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 6d19c80af2 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-13 22:15:55 -05:00
Jonathan Williams 6af5d9205b Added TimeUtil.java
Removed double gems.

Removed extra world uninitialize.

Changed AccountAdministrator to use UUID.
2014-05-13 22:13:48 -05:00
Chiss 002260dce8 better date 2014-05-14 12:57:43 +10:00
Jonathan Williams 12041b0d72 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-13 21:54:58 -05:00
Chiss 8ea344cacd fixed a NPE 2014-05-14 12:38:06 +10:00
Jonathan Williams 40ba1a64f8 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-13 14:46:15 -05:00
Chiss fbb0031dc1 fixed bug in dom where endCheck was being called multiple times
logging for world stuff
2014-05-13 11:18:17 +10:00
Jonathan Williams b1514fef5a Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-09 21:18:48 -07:00
Jonathan Williams 0ec08d5208 Fixed chunk load outside borders (disabled for testing right now) 2014-05-09 21:18:38 -07:00
Chiss 208a78b070 respawning players are tp'd if leave area. 2014-05-10 14:01:02 +10:00
Chiss d9225c003e CS Update 2014-05-10 09:55:27 +10: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
Jonathan Williams b72bcadbf4 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-06 22:38:50 -07:00
Jonathan Williams ebf40afe75 Fix dom bow shoot in lobby bug.
Work on preventing illegal builds.
2014-05-06 22:38:27 -07:00
Peter Miller e0dd0116a2 Beginning changes for stats from PlayerName to PlayerUUID 2014-05-06 17:06:19 -04:00
Jonathan Williams 5f2b2c251d Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-06 09:06:49 -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
Chiss f79b3b147c Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-05-06 15:59:20 +10:00
Chiss 223da7bf4d ResetAll for class skills 2014-05-06 15:55:14 +10:00
Jonathan Williams 2f397e7d2a Work on elo manager.
implemented coreclient cleanup.
2014-05-04 22:40:44 -07:00
Jonathan Williams f079333d3b Optimized ChunkBlockChange.
Still no dead chunks!

Fixed LobbyManager advertising to an empty lobby.
2014-05-04 18:29:19 -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 6e8bdfa769 disabled hub clock for tournament 2014-05-03 17:26:21 +10:00
Chiss 0ce3b3fb2d Disabled AFK kick during Tournament 2014-05-03 17:23:10 +10:00
Jonathan Williams fe7ed5c96a Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-02 23:19:05 -07:00
Chiss b432c094d9 Misisng ifles 2014-05-03 16:16:52 +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 e818662161 Added /spec toggle, to allow players to not partake in games.
Added TeamArmorAddon for games to use, to mark team colors easier.
Minor other changes.
2014-05-03 11:23:10 +10:00
Chiss 1d4d98b910 Twitch Prep
MAC changes
2014-05-02 14:35:41 +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 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
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 dc6a3da0fa Added more DMT words 2014-04-28 14:08:40 +10:00
Chiss 77809b409d MAC Update 2014-04-28 12:28:48 +10:00