Commit Graph

1366 Commits

Author SHA1 Message Date
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 de5c0a77ef Added another requirement for Lobbies in ServerMonitor 1500 available slots 2014-07-19 13:54:27 -07:00
Jonathan Williams e6818c4c46 Added small tweaks to lobby balancer and sorter for better spread on connect. 2014-07-19 13:54:03 -07:00
Jonathan Williams 8b747a81e1 Fixed filter bypass 2014-07-19 13:53:14 -07:00
CoderTim d2038670d6 Merge remote-tracking branch 'origin/master' 2014-07-18 02:52:26 -04:00
CoderTim efa74f509a Fixed bug where revealer doesn't always work
Prevent players from trading with sneaky assassin npcs
Display message when user powers up
2014-07-18 02:48:06 -04:00
Chiss b719916bb8 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
2014-07-18 08:32:35 +10:00
Chiss 7a6393463d Rank SR.MOD 2014-07-18 08:29:49 +10: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 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 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
CoderTim 64feaf63ed Implemented Sneaky Assassin Revealer kit 2014-07-15 00:36:38 -04:00
CoderTim c547801b7b Added Sneaky Assassin NPC movement 2014-07-11 22:55:48 -04:00
CoderTim b15534e1b2 Some work on Sneak Assassins NPCs
Added /game start <seconds> to start a game faster
Optimized GameTeam.GetSpawn() by avoiding unnecessary square root calculations
2014-07-11 00:56:25 -04: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
Mini-Chiss 5cd6bcfc82 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-07-08 18:08:46 -07:00
Mini-Chiss 03c56535ef MAPDATA 2014-07-08 18:08:37 -07:00
Jonathan Williams 97422e237f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-08 18:01:30 -07: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
Mini-Chiss bd6b9b8888 so many fix 2014-07-08 17:35:27 -07:00
Mini-Chiss c5e05523d3 sneakyfix 2014-07-08 17:34:47 -07:00
Mini-Chiss dd0040086d Parser Permissions
Sneaky Assasssin thingy.
2014-07-08 17:33:22 -07:00
Mini-Chiss 4d40df45d5 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-07-08 15:14:02 -07:00
Mini-Chiss 1455b4001f Parser Update 2014-07-08 15:13:30 -07:00
Jonathan Williams 45e38a8318 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-08 15:05:12 -07:00
Jonathan Williams fb5f92df2a Finalized internet status for bungees 2014-07-08 15:04:59 -07:00
Mini-Chiss 424a9defa9 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
	Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java
2014-07-08 13:19:55 -07:00
Mini-Chiss 7fcee333aa Merge 2014-07-08 13:18:55 -07:00
Jonathan Williams 2e5b003cff More work on internet status stuff.
Fixed some buggies with parser.
2014-07-08 13:18:27 -07:00
Jonathan Williams 2ccb27065c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-08 12:44:26 -07:00
Jonathan Williams 963c71f128 Fixed internet status stuff for bungees.
Fixed new portal arg req.
2014-07-08 12:44:17 -07:00
Mini-Chiss 848f843fbf Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
	Plugins/Mineplex.MapParser/src/mineplex/mapparser/WorldManager.java
2014-07-08 12:41:25 -07:00
Mini-Chiss 22709b0cd8 merge 2014-07-08 12:40:28 -07:00
Jonathan Williams 39b2ad57be Fix for map parser zipping. 2014-07-08 12:37:39 -07:00
Jonathan Williams 6ae35f1b37 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-08 12:20:28 -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
Mini-Chiss 65e7e1e0b3 Parser 2014-07-08 12:18:43 -07:00
Mini-Chiss cf25bdc44f Bridges fix being able to break mid chests before gamestart
Map parser Updates
2014-07-07 19:04:44 -07:00
Jonathan Williams 082cf98e99 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-07 16:26:08 -07:00
Jonathan Williams 64903ae4b4 Work on DDoS Protection switcher 2014-07-07 16:25:49 -07:00
Mini-Chiss ef86fe6948 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-07-07 16:24:43 -07:00
Mini-Chiss 62f6ea815d Champs Balance Update
Map Parser Update
2014-07-07 16:23:55 -07:00
CoderTim 3490db4b6f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-07 19:10:40 -04:00