Commit Graph

1380 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 2657a98e70 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-02-17 18:16:36 +00:00
samczsun ecb42d91fe Fix bugs 2017-02-16 02:04:34 -06:00
Sam 7452712107 Fix Constants 2017-02-07 00:12:51 +00:00
Sam c6bb850bc3 Lots of stuff 2017-01-30 23:28:55 +00: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
LCastr0 704c787008 Fixed lava and void issues again, prevents CME 2017-01-19 00:50:42 -06:00
samczsun 6692432c42 Smart™ Tab Completion©® 2017-01-18 23:30:39 -06: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
cnr 8d33a49397 Use a more explicit title for classic MineStrike 2017-01-12 15:59:57 -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
cnr ac32fbb15e Add StrikeGames to MineStrike NPC's server page 2017-01-12 00:54:59 -06:00
samczsun 132036bd17 Move Constants to common 2017-01-11 20:42:46 -06:00
samczsun 39ba03d1b4 Convert to UtilServer.isTestServer 2017-01-11 20:29:36 -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
cnr cea08cae67 Merge branch 'update/cosmetics-balloons' into develop 2017-01-11 15:32:41 -06:00
samczsun cbe238c83d Don't give book on join 2017-01-11 15:11:57 -06:00
LCastr0 21473a7d82 Fixed merge conflict 2017-01-10 21:27:47 -02: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 fa6a60981c Return to normal hub type 2017-01-04 20:36:16 -07:00
cnr 3af401ee8f Implement two-factor authentication 2017-01-04 20:33:09 -07:00
LCastr0 6478656501 Fixed armorstand balloon types 2016-12-29 16:25:20 -02:00
cnr ca19840b19 Revert "Disable communities temporarily."
This reverts commit 6d5d2b551b.
2016-12-22 16:50:35 -07:00
William Burns 6d5d2b551b Disable communities temporarily. 2016-12-22 17:07:36 +00: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 f2fc70f400 Titles 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 0ae158726a Remove last year's 'Massive Winter Sale' news 2016-12-01 03:56:29 -06:00
cnr 795f82d665 Set time to night in the Christmas hub 2016-12-01 03:00:36 -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
Shaun Bennett 192273314f Merge remote-tracking branch 'origin/develop' into develop
* origin/develop: (37 commits)
  Implement new sales announcement system in Lobbies and ClansHubs, and remove old Unranked Player Manager
  Fix SkyWarrior Kit
  Undo my report changes
  Set up support server with Thankful Chest tracking and Eternal Rank
  Add Cake Mount and implement it in Thankful Chest
  Use getName() instead of a String
  Enable MountChicken with some small modifications and add it to Thankful Chest
  Implement Thankful chest, patch Trick or Treat chest showing as purchasable, make SubscriptionDuration enum public and static, and create a Power Play Reward
  Remove MCL and OITQP from the stats page
  Take a second crack at fixing invisibility across Arcade and Clans
  Properly block placement of redstone-based blocks in Clans
  Fix Clans servers not restarting every night, display an uptime notification whenever Clans servers shut down for any reason, and remove unnecessary onDisables from the main ClansManager onDisable
  Patch Frozen players in clans spawning CombatLog NPCs when leaving, patch ClansCommandExecutedEvent not always being called, clean up ClanBanner code, and make Freeze System and Nether Manager effectively block Clans Commands (particularly teleportation)
  Fix game scoreboards breaking when given more than 15 lines and removed OITQ Payload from the server selection compass GUI
  Patch Items with type FEATHER, BONE, or RAW_CHICKEN being automatically instantly removed, patch Carl the Creeper not viewing playwire as an available reward to inform players about, and patch Carl the Creeper not informing players of available rewards on Clans Hubs and Lobbies not included in the main server group
  Fix HolidayManager being outdated
  Update Enderchest endpoint location
  Setup enderchest API
  QA changes
  More bugs
  ...
2016-11-24 00:51:46 -05: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 8882bfee5c Merge remote-tracking branch 'remotes/origin/develop' into update/uhc-moppletop
* remotes/origin/develop:
  Set up support server with Thankful Chest tracking and Eternal Rank
  Add Cake Mount and implement it in Thankful Chest
  Use getName() instead of a String
  Enable MountChicken with some small modifications and add it to Thankful Chest
  Implement Thankful chest, patch Trick or Treat chest showing as purchasable, make SubscriptionDuration enum public and static, and create a Power Play Reward
  Remove MCL and OITQP from the stats page
  Take a second crack at fixing invisibility across Arcade and Clans
  Properly block placement of redstone-based blocks in Clans
  Fix Clans servers not restarting every night, display an uptime notification whenever Clans servers shut down for any reason, and remove unnecessary onDisables from the main ClansManager onDisable
  Patch Frozen players in clans spawning CombatLog NPCs when leaving, patch ClansCommandExecutedEvent not always being called, clean up ClanBanner code, and make Freeze System and Nether Manager effectively block Clans Commands (particularly teleportation)
  Fix game scoreboards breaking when given more than 15 lines and removed OITQ Payload from the server selection compass GUI
  Patch Items with type FEATHER, BONE, or RAW_CHICKEN being automatically instantly removed, patch Carl the Creeper not viewing playwire as an available reward to inform players about, and patch Carl the Creeper not informing players of available rewards on Clans Hubs and Lobbies not included in the main server group

# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
2016-11-24 00:48:15 -05:00
AlexTheCoder c2de8c35e2 Fix game scoreboards breaking when given more than 15 lines and removed OITQ Payload from the server selection compass GUI 2016-11-23 23:41:10 -05:00
Sam 325c0ab56c Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop 2016-11-21 19:13:34 +00:00