Commit Graph

181 Commits

Author SHA1 Message Date
cnr
699845d6d7 Merge branch 'feature/gem-hunters' into develop 2017-02-25 00:40:05 -06:00
cnr
7de556e3d8 Allow plugins to choose a hub type when restarting
Clans Hubs will send to Clans Hubs, Clans will send to Clans Hubs, and
all other plugins will send to the normal Hub
2017-02-25 00:35:46 -06:00
Sam
8d47e80066 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-12 18:03:07 +00:00
samczsun
132036bd17 Move Constants to common 2017-01-11 20:42:46 -06:00
samczsun
19ac8f0c3b Create framework for proper test network 2017-01-11 20:29:36 -06:00
samczsun
56d4ed9e11 Parties rewrite
Basically everything got changed. Also Portal has a slightly better API
now
2017-01-11 19:50:26 -06:00
Sam
64026f81ff Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-08 21:12:28 +00:00
Sam
0218965bee Villager trading and loot upgrades 2017-01-08 15:44:04 +00:00
cnr
3af401ee8f Implement two-factor authentication 2017-01-04 20:33:09 -07:00
samczsun
6970c3205e AntiHack Logging 2016-12-20 15:05:01 -05:00
samczsun
77da6ac2c2 Remove MAC 2016-12-20 15:05:01 -05:00
samczsun
d291521ad1 Clean up DonationManager 2016-12-14 19:52:13 -07:00
cnr
fa0e42a918 Revert "Anticheat Logging #299"
This reverts commit cae9d2f67e.
2016-12-01 01:59:50 -06:00
cnr
cae9d2f67e Anticheat Logging #299
Remove MAC
Add AntiHack Logging
Change thresholds, add notifs, move stuff around
Add warning if check does not exist
Handle multiple bans when ranked TWITCH+
Prevent punishment abuse
2016-12-01 01:24:05 -06:00
Shaun Bennett
3d5e61e0f1 Eternal Giveaway Fixes 2016-11-17 21:05:10 -05:00
Shaun Bennett
cbc9aeedc6 Report Feature Improvements (#269)
Report Feature Improvements
2016-11-16 22:52:14 -05:00
AlexTheCoder
5e1fcabe36 Final changes for S2 2016-11-16 22:37:25 -05:00
Keir Nellyer
e0d05d3c87 PC-1140 Keep reports region-separated 2016-10-22 15:06:18 +01:00
samczsun
09fe7b736a Don't enable debugging 2016-10-19 22:38:39 -04:00
Keir Nellyer
b24429783b Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-09-22 16:28:16 +01:00
samczsun
92a0d606d4 Fix timings 2016-09-21 21:37:57 -04:00
Keir Nellyer
2cdab061b6 PC-886 Move report bans over to punishment gui 2016-09-16 17:40:14 +01:00
Keir Nellyer
acd63c90a1 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/UserPreferences.java
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/ExclusivePreferencesPage.java
#	Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-09-05 14:26:06 +01:00
Keir Nellyer
cd9423a8e4 De-couple chatsnap from report system 2016-08-27 22:21:56 +01:00
TadahTech
c9d14dc522 Update clans to new preferences. Remove debug messages. 2016-08-23 03:12:36 -05:00
cnr
5365f1269f Delay Anticheat enable in Clans
This ensure the anticheat has registered GameStartEvent before we fire
it
2016-08-18 20:46:24 -05:00
cnr
72ddfd5d85 Disable server spawn radius in Clans
Defer to the spawn claim area, instead
2016-08-18 20:44:01 -05:00
Keir Nellyer
a8e891f247 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
2016-08-11 14:53:57 +01:00
samczsun
7de9da3d1c Complete rework of disguising and antihack hook
This commit completely rewrites DisguiseManager, DisguisePlayer, and
PlayerDisguiseManager.

Changes to disguising means that much of the core was also changed,
primarily having to do with mapping by UUID versus player names.

Several new API classes were added, such as EntitySelector, Managers,
UtilTasks, and a brand new scoreboard API which is much more optimized and
allows for much longer lines

The new anticheat is hooked as well, with implementation for guardians
which follow the players around. Release two code is also included, but is
currently disabled via a boolean.
2016-08-10 21:03:30 -04:00
Keir Nellyer
1854b71757 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2016-08-05 17:05:01 +01:00
Keir Nellyer
bb9dbf1da4 PC-877 Vanish report handler when teleporting to offender's server 2016-07-29 15:08:03 +01:00
AlexTheCoder
a1fd021f8d Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-07-25 10:59:38 -04:00
AlexTheCoder
6f0d21120e Serious tweaks to gameplay and begin documentation 2016-07-25 10:59:03 -04:00
TadahTech
5d0b5f80c0 Fix Party server sending. Tweak playercount and GUI display 2016-07-21 18:01:43 -05:00
AlexTheCoder
1f2b1557d5 Work on amplifiers and deleting banners when the clan is deleted 2016-07-21 13:20:45 -04:00
Keir Nellyer
5c83f09456 SnapshotRepository no longer extends MinecraftRepository
It doesn't need to.
2016-07-08 23:26:33 -04:00
Keir Nellyer
0dc17bf6fa Further code cleanup 2016-07-07 18:12:52 -04:00
Keir Nellyer
a795ee3d0f Fix feature initialisation code 2016-06-23 01:18:16 +01:00
Keir Nellyer
09a74e3772 Work on pushing chat snapshots to db 2016-06-23 00:38:24 +01:00
Keir Nellyer
197acee4ae Implement server weighting 2016-06-11 13:47:45 +01:00
Keir Nellyer
20038f9e64 Massive changes made to how the report feature functions
Re-enabled report feature (merge from develop disabled it).
Moved reports from Redis to MySQL.
Made everything asynchronous.
Many many other miscellaneous changes.

Bugs will now be worked out and then this should be ready for QA testing
2016-05-29 00:25:26 +01:00
LCastr0
ed68ef332b Fixes for Win Room (Players were able to see other players)
Added command to allow other players to run ranked commands
Fixes code styles
2016-05-22 21:05:48 -03:00
Ben
35c7b9a2bd Incognito Updates:
-ADD: Prompt in Tab to identify who is in vanish (Can be a * or [Vanish])
-ADD: Make it so /stats don't work on vanished staff.
-ADD: Make sure it can be toggled off on /vanish again or network leave. Staff get stuck with it when resigning. Should stay on in-between lobbies.
2016-05-17 18:10:07 -05:00
cnr
f5cf751622 Revert "Temporarily disable clans ban functionality"
This reverts commit b47c49d93b.
2016-05-17 05:51:18 -05:00
AlexTheCoder
de1fabf53d Disable report system as it is not ready to go live 2016-05-09 02:10:51 -04:00
cnr
4aa44cd796 Merge branch 'develop' into clans/beta 2016-05-08 16:53:48 -05:00
cnr
b47c49d93b Temporarily disable clans ban functionality
This can be reverted when clans bans are properly audited/fixed/tested.
2016-05-07 19:02:19 -05:00
Keir Nellyer
a663cb3e01 Revert "Revert "Report system (version 1)""
This reverts commit d0d2de1e21.

# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2016-05-04 15:24:29 +01:00
cnr
8ca38b2598 Prepend http:// to resource pack locations 2016-04-30 18:54:17 -05:00
phobia
14204fba5c Changed resource packs to home hosted ones 2016-04-30 16:02:26 -05:00