JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,988 Commits 1 Branch 0 Tags 481 MiB
Commit Graph

2396 Commits

Author SHA1 Message Date
Ben 4bf19eebad Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-09 00:37:40 +01:00
Ben a04f7c23c6 Disable incognito for staff in hub invisibility, and vice-versa 2016-04-08 20:18:56 +01:00
Conrad S 8a2efa2f0b Make sure a user has enough gold to make a purchase. 2016-04-08 10:48:55 -04:00
Ben 79a2ef3608 Fix staff members getting unhidden when in incognito whenever players are shown to the player (can happen when a regular player toggles player vision, and the staff member gets shown to all other players.) 2016-04-07 22:24:47 +01:00
Ben eed3df720a Disable incognito mode for staff members that have been demoted whilst using it. 
Also fixes a bug that caused IncognitoHidePlayerEvent fire even if the player logging in does not have incognito mode enabled.
 2016-04-07 07:00:46 +01:00
Ben 3a8ab581dd Add JavaDoc to new classes to comply with the new standards 2016-04-07 06:52:52 +01:00
Ben d75d63a81a some missing files and blacklist barrier block from block toss 2016-04-06 18:26:56 +01:00
Ben 876a7a8eb6 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-05 12:37:23 +01:00
Ben 7f92a3c048 incognito changes 2016-04-05 00:38:27 +01:00
Jonathan Williams 2d296d9226 Removed debug ResourcePack Message 2016-04-04 17:45:34 -05:00
Jonathan Williams efa18d394b Fixed Incognito not saving status. 2016-04-04 17:45:10 -05:00
Jonathan Williams 02459c6a10 Fixed bad implementation of IncognitoManager that was locking up threads. 
Temporarily disabled MessageManager's handling of Incognito.
 2016-04-04 13:48:26 -05:00
Jonathan Williams 1b1e6f6ef5 Moved the redis operation before asking for a mysql connection 2016-04-04 13:45:20 -05:00
Shaun Bennett ff929a8515 Merge remote-tracking branch 'remotes/origin/develop' into clans/beta 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
#	Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java
 2016-04-05 00:57:28 +10:00
Shaun Bennett e11a9379b9 More tutorial tweaking 2016-04-04 12:32:22 +10:00
Jonathan Williams 401127caa9 Reworked Monthly bonuses so they always succeed and it logs them. 2016-04-03 01:36:30 -05:00
Jonathan Williams ff41ad248a Removed PvpTimer 
Fixed issue where StatManager and FriendManager were created twice.
 2016-04-02 02:47:17 -05:00
Jonathan Williams fa6d18b0fa Fix sync db call inside sendMessage 2016-04-01 22:43:09 -05:00
Cheese 8f959a73eb debug 2016-04-02 12:46:25 +11:00
Cheese 9969b7d783 support for resource packs for different MC versions 2016-04-02 11:39:40 +11:00
William Burns 4ec833727f PC-20 - Detailed Objective Text 2016-03-31 18:45:17 +01:00
Shaun Bennett caf8170a32 Tutorial Changes 2016-03-27 08:47:34 +11:00
William Burns c1adb7e1bc Remove Slack attachment functionality (for now). 2016-03-26 13:12:59 -04:00
William Burns 29966195ee Create an API for sending Slack message to multiple teams and channels. 2016-03-26 13:07:41 -04:00
Ben f000360565 missing a few files 2016-03-24 19:29:45 +00:00
Shaun Bennett 3d473ad00a Merge remote-tracking branch 'origin/clans/beta' into clans/beta 2016-03-23 20:39:21 +11:00
git 4dd756286e Fix small resource pack bug 2016-03-23 20:32:13 +13:00
Shaun Bennett e8dcc4a3e2 Merge branch 'develop' into clans/beta 
# Conflicts:
#	Plugins/Mineplex.Cache/src/mineplex/cache/player/PlayerCache.java
#	Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
#	Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2016-03-23 11:02:20 +11:00
Shaun Bennett 1e73adf2af Increase ram and cpu for event server 2016-03-23 10:23:04 +11:00
Shaun Bennett 656780d027 Change runAsync in MiniPlugin to use our own thread pool 
This allows the tasks to run immediately. Using Bukkit's scheduler the async task wont start until the next server tick
 2016-03-23 10:22:40 +11:00
Shaun Bennett da9a642a6d Process item for treasure before opening 2016-03-23 10:21:36 +11:00
Shaun Bennett 309b5464f2 Clean up Account Repository, attempt to load account ID from cache 2016-03-23 10:21:02 +11:00
Shaun Bennett 85cb065d5c Merge pull request #14 from Mineplex-LLC/Dual_1.9 
1.9 Bugfixes + Ring game
 2016-03-22 19:25:37 +11:00
Shaun Bennett 61b79fab9d Merge pull request #13 from Mineplex-LLC/PC-15 
Fix PC-13, PC-15, PC-16, PC-17
 2016-03-21 20:31:58 +11:00
Jonathan Williams b4dfeb224b Reduced NCP exempt time by .5s. 2016-03-21 02:06:11 -05:00
Jonathan Williams 8427ead097 Changed how currency types is initialized to avoid possible NPE 2016-03-19 15:33:16 -05:00
Ben 995d454f87 tutorial additions. 2016-03-18 02:47:51 +00:00
Ben a4cbe54c78 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
 2016-03-18 01:21:25 +00:00
Ben 2cf59ced8b new pvp timer management, fixed build house task, fixed incognito 2016-03-18 01:18:35 +00:00
Ben add651780b priority chat filters, fixed siege weapon clicking listeners being incorrect 2016-03-17 01:06:07 +00:00
Ben 93767b7a90 tutorial changes, chat filter system, commented out all web stuff for analytics. 2016-03-16 22:46:18 +00:00
Ben 0d237370e1 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-15 23:33:09 +00:00
Shaun Bennett e53b8616d1 A ton of tutorial work 2016-03-15 10:29:43 -05:00
Ben 813a3833ae implement temporary holograms 2016-03-15 00:48:50 +00:00
Ben e08ba29ac1 Final fixing of cannon saving/loading 2016-03-14 22:48:31 +00:00
Ben 422df69335 incognito async stuff and updated alpha holograms 2016-03-11 21:50:48 +00:00
Ben 86c50cc3cd updates 2016-03-11 19:03:32 +00:00
Shaun Bennett 1228ca227e Add support for 1.9 resource packs, Text Tutorials 2016-03-11 11:50:08 -06:00
Ben a27fb90c2a Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito 2016-03-11 02:21:03 +00:00
Ben 0e276474c5 fixerroooniissssss 2016-03-11 02:20:18 +00:00