Commit Graph

108 Commits

Author SHA1 Message Date
AlexTheCoder 3ebfb453c5 Implement rank and powerplay linking to the website and give specific ranks an id corresponding to their respective forum tag 2017-03-23 23:18:29 -05:00
LCastr0 defece04a9 Fixed some issues changing Creature to Entity 2017-03-20 16:33:20 -03:00
AlexTheCoder a691d58840 Set up clans specific rewards for voting, daily bonus, and youtube clicks. Additionally, set up promotion for specific youtube channels in Carl. Finally, provide support for a differently-named creeper! 2017-03-09 01:04:50 -06:00
cnr 06a71946a0 Publish server status earlier during startup
Servers are allowed ten seconds to publish their status on startup by
ServerMonitor. NpcManager can consume most or all of that allotted time
on EU, so we need to initialize ServerStatusManager first.
2017-03-03 08:15:56 -06:00
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 3a4e973551 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-02-12 13:12:53 +00:00
AlexTheCoder 11791bc461 Block joining clans servers via friends, block joining of clans servers that are restarting, clean up log mob armor stands on restart, take staff out of observer mode on restart 2017-02-09 22:44:30 -06:00
Sam 3557fd8acc Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-21 14:21:03 +00:00
samczsun 343167245e Fix party chat 2017-01-19 18:16:43 -05:00
Sam 8a9a3cb2ac Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-19 21:16:12 +00:00
samczsun 8e5483e42b PC-190
Ignoring listened on too high of a priority and chat managers didn't
respect the recipients list. Those two issues have been fixed in this
commit
2017-01-18 23:20:24 -06:00
Sam 1a580251e9 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-17 09:51:17 +00:00
cnr 5ba3fac58c Check twofactor status instead of interact events 2017-01-14 01:29:37 -06:00
cnr 89ccaf4323 Disable hotbar items when authenticating with 2FA 2017-01-13 01:14:31 -06:00
cnr cdfc19f566 Ignore canceled player interact events 2017-01-12 23:05:34 -06:00
Sam d5be0f5061 Remove args to match new parameters 2017-01-12 18:04:59 +00: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
AlexTheCoder 2611ba7a7a Bugfixes from iteration, & new features requested by sampson sigils and relyh 2016-12-21 19:30:53 -07:00
samczsun 6970c3205e AntiHack Logging 2016-12-20 15:05:01 -05:00
samczsun fd00644eb8 Finalize Titles 2016-12-14 19:56:27 -07:00
samczsun d291521ad1 Clean up DonationManager 2016-12-14 19:52:13 -07:00
samczsun 20697982e7 Create Rank ScoreboardTag to fix Name collision 2016-12-07 13:05:54 -06: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
AlexTheCoder 58fe232520 Fix redis pubsub for SalesAnnouncements 2016-12-01 01:20:18 -06:00
AlexTheCoder be4627812b Implement new sales announcement system in Lobbies and ClansHubs, and remove old Unranked Player Manager 2016-11-24 00:51:28 -05:00
Shaun Bennett 3d5e61e0f1 Eternal Giveaway Fixes 2016-11-17 21:05:10 -05:00
LCastr0 b862a30c76 Thanksgiving Cosmetics (#278)
* Added chickens to Holiday Manager (Thanksgiving)
Added TextEffect
Moved all the effects to a different package to make it easier to find
Added method in Effect to get the Effect Location

* Removed(?) wildcard import

* Testing New year thing
Added some symbols to UtilBlockText

* Allow multiple pets with the same EntityType

* Added Stray Morph
Added Shulker Pet
Added code for a possible new year effect
Added Metal Man Morph to the menus
Added Metal Man Morph as an yearly bonus for PPC subscriptions

* Added chickens to Holiday Manager (Thanksgiving)
Added TextEffect
Moved all the effects to a different package to make it easier to find
Added method in Effect to get the Effect Location

* Removed(?) wildcard import

* Testing New year thing
Added some symbols to UtilBlockText

* Allow multiple pets with the same EntityType

* Added Stray Morph
Added Shulker Pet
Added code for a possible new year effect
Added Metal Man Morph to the menus
Added Metal Man Morph as an yearly bonus for PPC subscriptions

* I seriously don't remember what is in this commit, I'm just doing it to
fix the thing with develop...

* Fixed Pet menu
Fixed morph menu
Changed from List to Set

* Changed from PurchasUnknownSalesPackage to AddUnknownSalesPackageOwned

* Added Santa Morph
Removed Sleigh Morph
Changed all the cosmetics GUIs to start on the second row, instead of the first

* Changed some stuff from Holiday Manager so now chickens will walk around when spawned

* Added sound effects to Metal Man
Added slowness to Metal Man

* Added new lore for the Metal Man Morph description
Added Stray Morph Ability
Fixed some problems with the Thanksgiving Chickens

* Added Fated giveaway manager and animation
Moved titan and fated giveaway managers to a new package

* Fixed lores for Stray morph and Shulker pet
Changed ability of Stray morph

* Removed Stray and Shulker pet from the menu
Deleted Pet class since it was not being used
Changed position of achievement on the menu
Changed color of chicken's name
Changed colors of Power Play message
Stray morph, Santa morph and Shulker pet are hidden from the menus for now
Removed feathers dropping from chickens, changed them to snow particles

* Added hover ability to Metal Man Morph

* Fixed some stuff on Metal Man
2016-11-17 02:06:00 -05:00
AlexTheCoder 0070fed6c7 Fix playwire multithreading and convert to new 5-ticket per 24-hour system 2016-11-16 21:42:47 -05:00
Timothy Andis 3d7647b26b Game Lobby Update (#215)
* Game Lobby update. Phase 1.

* Correctly apply kit data to players who use the next best game feature.

* I can do integer comparisons, I promise.

* So much stuff, all minor.

* Suck it Carl.

* Fix Party bug.
Update LobbyManager

* Allow QA to test KitProgression @shaun cherry pick this plz.

* Proper generation check (testing)
Remove debugging from NextBestGame

* Correct Amplifier looking direction.
Fix Death tag hard coded kits
Misc podium work.

* ClansHub and Tweaks to the lobby manager

* WA Tweak.
2016-09-28 10:17:05 -04:00
Timothy Andis bf61296948 PlayWire Ad integration (#207)
* PlayWire integration.

* Tweak PlayWire display.
Update the GUI command.
Temp set cooldown to 10 seconds for testing *WILL BE REMOVED*

* PlayWire stuff.

* PlayWire streaks and tweaks.
2016-09-21 21:24:58 -04:00
cnr f6db5393a3 Merge branch 'project-cosmetics' into develop 2016-09-02 00:08:23 -05:00
cnr 55086efd91 Merge branch 'feature/shadowmute' into develop 2016-08-31 23:16:57 -05:00
AlexTheCoder 8397f53d39 Remove unneeded teleportation in clans hubs 2016-08-30 03:27:11 -04:00
Shaun Bennett f72647e1d4 Merge with develop 2016-08-29 21:56:03 -04:00
Shaun Bennett f3e38031ab Add shadowmuting 2016-08-29 18:57:07 -04:00
LCastr0 3e38eb5990 Fixes to the merging conflicts 2016-08-25 20:13:59 -03:00
cnr 8617572980 Fix preferences menu interaction in Clans{,Hub} 2016-08-25 02:26:42 -05:00
TadahTech c9d14dc522 Update clans to new preferences. Remove debug messages. 2016-08-23 03:12:36 -05:00
TadahTech 3b9d6adfbc Lobby Update 2016-08-23 01:37:07 -05:00
LCastr0 84c6720d1c Fix merging errors 2016-08-18 18:30:32 -03:00
LCastr0 f4175ed724 Added PowerPlay managers, commands, button inside Carl to claim PowerPlay bonus... Includes a new SQL table, will be sent to Connor and Jaws so they can release it correctly! :D 2016-08-18 18:07:32 -03: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
Shaun Bennett ca13b8f29e Fix compile errors 2016-08-03 14:18:26 -05:00
Shaun Bennett f41cd8c104 Add /thank command. Update jooq files 2016-08-02 00:10:46 -05:00
AlexTheCoder 157c969e8d Completely prevent players in parties from joining Clans servers 2016-07-27 05:51:49 -04:00
AlexTheCoder 9c700425fd More javadocs 2016-07-26 22:32:46 -04:00
AlexTheCoder 61eca3ced0 Removed auto disguising from clans hub and removed clans tnt protection 2016-07-26 00:54:31 -04:00
AlexTheCoder b41ad2e087 Fix NPC orientation in clans hub 2016-07-25 12:28:25 -04:00
AlexTheCoder aecaa89443 Update clans hub spawn location 2016-07-25 12:08:37 -04:00
AlexTheCoder 275ab52f79 Create a clans-only hub 2016-07-25 10:55:18 -04:00