Commit Graph

1104 Commits

Author SHA1 Message Date
Sam
1a580251e9 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-17 09:51:17 +00:00
LCastr0
9e4f756fe8 Even better way of making pet circle around you 2017-01-15 02:46:44 -02:00
LCastr0
28442abbbd Now using the correct naming... 2017-01-14 23:09:46 -02:00
LCastr0
03c2ec56b7 Added love wings 2017-01-14 22:21:38 -02:00
LCastr0
d667524ed9 Love Doctor Morph 2017-01-14 20:50:44 -02:00
samczsun
251eb2e53e Let's be legal 2017-01-12 23:22:40 -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
e72d1e51a2 Ignore bypass for testing sever motd 2017-01-11 20:29:37 -06:00
samczsun
19ac8f0c3b Create framework for proper test network 2017-01-11 20:29:36 -06:00
cnr
cea08cae67 Merge branch 'update/cosmetics-balloons' into develop 2017-01-11 15:32:41 -06:00
samczsun
99211d5d89 Fix particles 2017-01-11 15:11:57 -06:00
Sam
0218965bee Villager trading and loot upgrades 2017-01-08 15:44:04 +00:00
LCastr0
6478656501 Fixed armorstand balloon types 2016-12-29 16:25:20 -02:00
Sam
e114ab03b5 Chest spawning 2016-12-27 17:20:53 +00:00
LCastr0
d19d661c7d Modified pets so they don't make different sounds anymore :toot: 2016-12-26 19:02:35 -02:00
LCastr0
6712ad427b Added bat so players can use items in hand with the leash
Changed silence method so it works :toot:
2016-12-26 19:00:11 -02:00
Sam
a4a039b619 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2016-12-25 22:09:03 +00:00
AlexTheCoder
94d8e5d2f4 Update Formatter to support specifically colored commands 2016-12-21 19:30:54 -07:00
AlexTheCoder
ac224e3f68 Initial communities code 2016-12-21 19:30:25 -07:00
samczsun
7f3bb9671a Change thresholds, add notifs, move stuff around 2016-12-20 15:05:52 -05:00
samczsun
383c4d3670 More 2016-12-20 15:05:26 -05:00
samczsun
77f1f18f27 More metadata 2016-12-20 15:05:01 -05:00
Sam
9409cbc42c Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2016-12-19 00:32:53 +00:00
samczsun
58761a0478 1.8 blocker 2016-12-15 20:48:40 -07: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
Sam
d0f3aff051 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2016-12-10 11:21:20 +00:00
cnr
b7e738b4e8 Revert commits from #302
This reverts commits from the range 062fdd3^..a0beeab

Changes from #302 are on hold until a later date.
2016-12-08 20:41:46 -07:00
Sam
58613fa77f Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2016-12-08 19:42:55 +00:00
Sam
b6173c4990 Google Sheets implementation 2016-12-08 19:25:48 +00:00
Nate Mortensen
a0beeab5ec Fix Frost Barrier not activating
Negative yaw values are considered valid in minecraft.
UtilShapes doesn't correctly handle negative yaw values
(throws an ArrayIndexOutOfBoundsException) so whenever
a player is facing east they're unable to activate Frost
Barrier.

This commit fixes the issue by allowing UtilShapes to take
negative values.
2016-12-07 13:20:04 -06:00
samczsun
20697982e7 Create Rank ScoreboardTag to fix Name collision 2016-12-07 13:05:54 -06:00
LCastr0
97ce2d0ae6 Gingerbread Cosmetics
Adds the following:
- Gingerbread Chests
- Holiday Tree particle
- Freeze Suit
- Winter Warfare win effect
- Present Danger Win Effect
- Gingerbread Man pet
2016-12-01 23:39:33 -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
Shaun Bennett
f6bf316afb Update rank colors 2016-11-24 04:58:03 -05:00
Shaun Bennett
15f3b19f8a Merge remote-tracking branch 'origin/update/uhc-moppletop' into update/uhc-moppletop
* origin/update/uhc-moppletop:
  Retry CTF proxy fix
  Eternal Giveaway Fixes
  Eternal giveaway refactoring
  Revert: Disable Fated giveaway tools for now
  Eternal Rank

# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java
2016-11-23 18:11:26 -05:00
Shaun Bennett
bfa27f2bc4 Update Enderchest endpoint location 2016-11-23 18:10:59 -05:00
Shaun Bennett
e892476ca0 Setup enderchest API 2016-11-22 08:17:24 -05:00
Sam
325c0ab56c Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop 2016-11-21 19:13:34 +00:00
Shaun Bennett
712019b45b Eternal Rank 2016-11-17 21:05:10 -05:00
Sam
53b67214fb More bugs 2016-11-17 21:20:00 +00:00
Sam
142cf4dd93 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop 2016-11-17 19:41:47 +00: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
1535fcc38b Fix temp blocks in unloaded claims not restoring, fix ClassCombatCreatureSpawnEvent having a null world name, fix block toss fallingblocks solidifying in unloaded chunks, make safelog in clans disable when server shuts down, and make UtilBlock recognize 1.8 fence gates as usable blocks 2016-11-16 22:37:25 -05:00
Sam
07cd716cf7 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop 2016-11-13 10:37:21 +00:00
Sam
6a9648e646 Solo Mode and Faster UHC 2016-11-05 11:06:12 +00:00
LCastr0
9267a36528 Disable Halloween 2016 (#261)
* Removed all the halloween related items:
 - Haunted chests can only be opened if player already had ammo
 - Removed Halloween theme from the hub
 - Removed pumpkins from in-game

* Added Halloween items to the Omega Chest

* Fixed weight for items in the omega chest

* Changed Disk to Disc in RewardManager
Changed values for omega rarities

* Final commit (removed win room test command)

* Removed Halloween words from Draw My Thing and Master Builders
2016-11-02 16:49:31 -04:00
samczsun
a729b03ce7 UtilParser: Handle null lastDamageCauses 2016-10-28 17:57:25 -04:00
samczsun
70ed2e4fbb CompassModule
Integrate with CombatLogModule
2016-10-28 17:56:46 -04:00
samczsun
e8becf3819 Op on dev servers too 2016-10-28 17:56:08 -04:00
Shaun Bennett
0c0ad5ab13 PPC Items (#252)
Update/ppc items
2016-10-26 22:30:58 -04:00
Shaun Bennett
f06325d972 Super Smash Mobs Update (#243)
Update/ssm
2016-10-26 22:03:43 -04:00
LCastr0
56db128730 Merge pull request #251 from Mineplex-LLC/develop
Merge 'develop' into 'update/ppc-items'
2016-10-21 13:05:00 -02:00
xGamingDudex
c8edc2d01e Rewrote daze potion damage calculations 2016-10-21 00:54:04 +02:00
samczsun
d2c0b34459 PlayerMap 2016-10-19 22:38:39 -04:00
LCastr0
225f5c6b7c Internal:
- Removed Win room test command
 - Fixed spelling error in MountSpider
 - Changed MountChicken so it can now jump
 - Still working on the Sleigh morph
 - Added Wind Up Suit for testing
 - Removed unused code from MountSpider

External:
 - Added Sleigh Morph (Still need some work on it)
2016-10-19 18:44:57 -02:00
Sam
c93e6be98b Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2016-10-13 22:43:08 +01:00
xADudex
311751cc39 Pumpkin's Revenge (#237)
* Initial Commit

* Update

* Bunch of new stuff

* Fixed fletcher arrow typo

* Added reward pet, fixed typo, tweaked lose cinematic

* Lots of tweaks and fixes with QA

* Cleaning up a little code

* Removed debug message on prince death

* Added nighttime to halloween game lobby maps

* Tweaked spawn rates and mob caps

* Typo

* Tweaked texts, cleaned import and cleared all mobs from boss cinematic

* Fixed creepers not getting properly removed during boss cinematic

* Reward typo

* Fixed rare NPE

* Typos

* Tweaked mini zombie

* Typo

* Prevent zombie from spawning minis after being removed

* Tweaked wave announcements + formated WaveVictory

* Changed color of prince tag + formated ZombieSpawner

* Fixed (another) rare NPE

* Tweaked boss wave cinematic
2016-10-12 22:40:05 -04:00
Sam
2b124cb16c I have really lost track on what I'm doing... 2016-10-09 12:24:49 +01:00
LCastr0
8ab61b2b06 Public:
- Added Chicken Mount
 - Added Turkey Morph

Internal:
 - Changed the Morph system (Using UtilMorph)
2016-10-06 14:19:44 -03:00
LCastr0
8da5813f29 Add Halloween Cosmetics (#227)
* Internal:
Changed imports from java.awt.Color to org.bukkit.Color

External:
Added Double Jump Halloween
Added Arrow Trail Halloween
Added Pumpkin Hat

* Internal:
Fixed Arrow Trail Halloween
Added new methods to ParticleData
Renamed playerNPC to _playerNPC (WinEffectLavaTrap)
Removed unecessary method (WinEffectManager)
Added a command to test win rooms properly
Fixed Squid Morph not showing name unless players hovered over it
Created a Manager for the Morphs so we avoid using deprecated methods

External:
Added Halloween Win Room
Added Grim Reaper Morph
Added Headless Horseman Morph
Added Nightmare Steed

* Internal:
Renamed RewardType enums to have upper case

External:
Added Halloween Death Effect
Added Haunted Chest
Added Baby Zombie Jockey Pet
Changed the names of the items
Added Grim Reaper pet

* Slack integration to test stuff (Will not be in the code in the last commit)

* Fixed Grim Reaper Hoe not being removed after the morph is disabled

* Details for the Haunted Chest

* Details for all the items (lores, icons, texts, effects, etc)
Removed Headless Horseman Morph

* Fixes for lores and names
Support server stuff

* Fixes for the Lock and Unlock cosmetics commands

* Fixes for the Grim Reaper Morph

* Fixes for the Grim Reaper Morph
Removed debug messages

* Fixed a memory leak. Thanks to Sam

* Fix imports

* Removed unused code
Added javadocs to UtilTextBottom#displayProgress()
Added javadocs to UtilAlg#getRandomLocation()

* Removed Death Effect
Increased Arrow Trail particles
Increased Double Jump particles
2016-10-05 10:27:45 -04:00
cnr
6e2512e0cf Merge branch 'project-cosmetics' into develop 2016-09-30 21:47:08 -07:00
Keir Nellyer
1543b539ba Refactor unbox optional collection to utility class 2016-09-26 11:01:27 +01:00
Keir Nellyer
42ea7f85af Remove un-required tab changes 2016-09-25 01:36:23 +01: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
Shaun Bennett
e15804fc15 Prevent players from joining 1.9+ games with 1.8 clients (#212) 2016-09-21 23:19:55 -04:00
Sarah
c1c46aceb8 Skyfall Game(#208)
* basic prototype of the game Skyfall

* new crumble mechanic

* Developing basic game with basic mechanics and basic kits.

* Fix merge issues

* Add Supply Grop and Deathmatch and change map crumbling

* Make cosmetical changes for QA and add Stat Trackers and Achievements

* Add version requirement

* Change scoreboard layout

* Dont crumble the first island, but the islands over the spawn points

* Remove Surefoot, fix TNT, remove boats and remove elytra on contact with water/lava

* Unused imports

* Fix kit description, modify island crumbling and add ring damage

* Revert to normal crumble values

* Add Javadoc

* Remove more unused imports

* Check for material data on ring generation

* Add Block effect for Booster Ring recharge

* Unused imports...

* Add Elytra removal message and countdown

* "Fix" food issues and some other minor things

* Add chest refill to scoreboard from beginning

* Fix supply drop

* Unused imports.....

* Re-enable Anti Cheat

* Add java doc, remove system messages and add exeptions

* The end of the great label debate

* Fix method naming conventions

* Remove more labels

* Disable Booster kit
2016-09-21 21:57:38 -04:00
samczsun
ec4add259d Teleport players back to center of arcade lobby 2016-09-21 21:37:57 -04:00
LCastr0
ae6868b76a Added Witch Morph
Added Metal Man morph
2016-09-16 20:46:52 -03:00
Keir Nellyer
5e5cb3284a Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-09-12 10:11:31 +01:00
Shaun Bennett
9318ba4de2 Merge branch 'develop' into bugfix/samczsun
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java
2016-09-07 20:12:57 -04:00
samczsun
444fe5d151 Remove hacky reflection method to get server name 2016-09-05 18:37:17 -04: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
Sam
4b1c93150b Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-09-03 20:12:39 +01:00
Sam
8d5d0c6272 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-09-03 18:29:37 +01:00
Sam
fc0217f1fd More magic OITQ 2016-09-03 18:25:17 +01:00
cnr
f6db5393a3 Merge branch 'project-cosmetics' into develop 2016-09-02 00:08:23 -05:00
cnr
9cd5b73432 Merge branch 'update/basketball-game' into develop 2016-08-31 23:19:51 -05:00
Sam
47df09b770 Handle null sound 2016-08-31 12:07:35 +01:00
AlexTheCoder
8ca214a4d8 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game 2016-08-30 01:37:14 -04:00
TadahTech
39ea280098 NextBestGame code and new hub releases 2016-08-29 20:21:36 -05:00
LCastr0
3687c7ad98 PowerPlayClub update 2016-08-29 21:32:11 -03:00
Sam
7a3ce9813c Payload (OITQ) 2016-08-29 23:08:04 +01:00
Sam
a35c162dc4 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-08-26 21:26:16 +01:00
LCastr0
3e38eb5990 Fixes to the merging conflicts 2016-08-25 20:13:59 -03:00
TadahTech
bca19788db Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/progression/ProgressiveKit.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeDetailsButton.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeMenuButton.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitDisplayMenu.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitInformationTrackerMenu.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java
2016-08-24 21:28:36 -05:00
Keir Nellyer
469a72afc0 JavaDocs 2016-08-23 16:40:25 +01:00
TadahTech
3b9d6adfbc Lobby Update 2016-08-23 01:37:07 -05:00
Sam
e6530a6f44 More tweaks and fixes 2016-08-20 12:14:01 +01:00
LCastr0
84c6720d1c Fix merging errors 2016-08-18 18:30:32 -03:00
Keir Nellyer
3126d540e7 /reportstat command progress 2016-08-16 21:30:37 +01:00
Sam
29a07c60ab Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-08-16 11:02:15 +01:00
Shaun Bennett
a744566cd3 Add AntiSpam front end 2016-08-11 11:34:17 -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
Sam
2b8754aa32 Metal Kit bug fixes 2016-08-02 23:34:12 +01:00
LCastr0
ab8d6daa2c GitHub being annoying again 2016-07-28 19:59:49 -03:00
cnr
dd38a1dd76 Merge branch 'update/clans' into develop 2016-07-27 20:40:35 -05:00
cnr
05e59ae9cc Revert "Revert "Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing""
This reverts commit 917b83250d.
2016-07-27 19:03:04 -05:00
AlexTheCoder
031a9575ae Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-07-27 15:13:18 -04:00
cnr
3d0cc2a5fd Refactor Clans gold dependency out of core 2016-07-27 13:52:03 -05:00
Keir Nellyer
4dbbe6c32a Allow Collector instance to be configured in parameters 2016-07-27 16:49:50 +01:00
LCastr0
195a82f78f Github is annoying me about this, but I don't know what it is 2016-07-24 13:18:33 -03:00
AlexTheCoder
fc3ceddf4d Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2016-07-21 15:47:59 -04:00
AlexTheCoder
2615ef74dd Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-07-21 05:09:54 -04:00
Keir Nellyer
1ca7519963 Make index preservation faster 2016-07-20 13:19:21 +01:00
Keir Nellyer
85c1bc1728 Ensure returned list really is in the original order 2016-07-20 13:08:33 +01:00
Keir Nellyer
a78c71793a Made filter method return results in the same order they were entered and generally improved method code 2016-07-20 12:46:10 +01:00
Keir Nellyer
37a06816dd Modify /reportclose to no longer require a report id parameter 2016-07-19 16:37:53 +01:00
Keir Nellyer
976e8788b7 Update report message if a player reports another player multiple times 2016-07-18 18:37:21 +01:00
Keir Nellyer
f0c2686ca7 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-07-14 23:01:11 +01:00
cnr
917b83250d Revert "Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing"
This reverts commit 30287a0832, reversing
changes made to b8650d741d.
2016-07-14 00:10:37 -05:00
samczsun
7dcf7378ef Many changes
Fix spectator race condition
Refactor out cut clean into modules
Add combat log module
Add antixray module
2016-07-13 21:30:54 -05:00
AlexTheCoder
d3270b9289 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-07-11 14:50:16 -04:00
AlexTheCoder
30287a0832 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing 2016-07-11 14:46:08 -04:00
AlexTheCoder
0be317e5be Implement tweaks and finalize implementations for bosses and fix loot dropping bugs 2016-07-11 11:36:48 -04:00
Keir Nellyer
b808121d68 Make ReportResult and ReportMessage timezone friendly.
This switches all if not most of the report feature code to using the
 new Java 8 date time API since it is much better for handling
 timezone's.

 This commit also creates a few new methods in UtilTime as they are
 used throughout the "report" and "chatsnap" packages. They may also
 come in useful for other developers using timezones.
2016-07-09 23:41:39 -04:00
xGamingDudex
5349d26115 Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into feature/mavericks-master-builders 2016-07-08 03:41:13 +02:00
xGamingDudex
c50ec49ad9 Minor updates
Tweaked some location values.
Added more event handling to the reveiw hub and mavericks hub.
Added builder info holograms to all sides of the display slots in the
mavericks hub.
2016-07-08 02:59:33 +02:00
Keir Nellyer
cb555a41ab Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-07-07 20:47:19 -04:00
AlexTheCoder
eccd7deedc Fix merge errors and properly force disable particles by checking the game's settings 2016-07-05 17:25:01 -04:00
AlexTheCoder
b51ee4a066 Create an event for stronger control over Velocity changes 2016-07-05 07:51:41 -04:00
LCastr0
050ae75e49 Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-07-02 13:33:33 -03:00
LCastr0
7a6335a021 Fixes for win rooms? Or not yet?! 2016-07-02 13:32:35 -03:00
samczsun
3e1c44bfa3 UHC improvements
Lots of hacky NMS stuff. Ask me if you're confused

Basically, decorate the world async
Keep spawn chunks loaded
Make sure view distance is capped so no chunks are genned on teleport
Add regeneration and resistance on spawn to prevent damage
Set health objective score manually
Teleport player two times to ensure no block glitching
Disable kicking and NCP while teleporting
2016-06-30 17:15:01 -05:00
xGamingDudex
6d9e84b817 Merge branch 'develop' of
ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into
feature/mavericks-master-builders

Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/F.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/BuildData.java
2016-06-30 23:08:31 +02:00
samczsun
045e1b3064 Fix various Clans bugs
Viper destroying armor
Legendaries not saving properly
Combat log NPC for vanished players
2016-06-30 05:20:44 -05:00
xGamingDudex
cd5555c3f9 Fixed invis entities after pasting blocks + removed debug code 2016-06-28 04:03:40 +02:00
xGamingDudex
966eaf1616 Fixed some entity tracking bugs regarding chunk update packets 2016-06-27 00:16:04 +02:00
Keir Nellyer
323d865b57 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
# Conflicts:
#	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-06-24 18:13:51 +01:00
Shaun Bennett
fd843b88cb Merge remote-tracking branch 'remotes/origin/develop' into feature/boosters-final
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/inventory/GemBooster.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
#	Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java
2016-06-23 23:02:26 -07:00
cnr
3433e0e3bc Merge branch 'project-cosmetics' into develop 2016-06-23 18:42:47 -05:00
LCastr0
7749314e64 Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-06-23 16:11:49 -03:00
LCastr0
a441727e09 Freedom update:
Freedom chests
Freedom Aura
Shock and Awe
Leap of Freedom
Price of Freedom
Uncle Sam Morph
Freedom Mount
Uncle Sam Hat
Persistence update:
Items will still be enabled after player leaves the server
2016-06-23 16:09:31 -03:00
Shaun Bennett
249a5c70aa Merge remote-tracking branch 'remotes/origin/develop' into feature/boosters-final
# Conflicts:
#	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-06-22 20:35:40 -07:00
Shaun Bennett
906e0e0044 Allow API error messages from HTTP 503 2016-06-22 20:31:18 -07:00
Keir Nellyer
addbd4dd88 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-06-23 01:21:12 +01:00
samczsun
d739df8623 UHC is faster now 2016-06-21 22:21:27 -05:00
Keir Nellyer
f34c65111b Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-06-18 00:48:00 +01:00
xGamingDudex
d6afe986ea Update and mavericks-review-hub plugin [stand alone]
Added NBT Utils
Added Format util for color
Fixed bounding box calculations in UtilBlock
Improved getPlugin in UtilServer
Added BuildDataCylinder
Added Particle support for saving builds
Added Debug command to BuildMavericks
Changed some backend DB stuff for saving builds

Added mavericks-review-hub plugin:
*
2016-06-17 14:14:39 +02:00
Shaun Bennett
0873ee0116 Show entire booster queue in booster gui 2016-06-16 16:54:54 -05:00
samczsun
01409af5bd
Fix misc bugs
Change UtilServer to return proper plugin instance
Remove /energyshop debug command
Add warning for opening chests while in vanish
Fix item maps being broken
Fix tutorials possibly wiping inventory
Make the project compile
2016-06-16 16:39:43 -04:00
samczsun
d49ce27a1b
Make GearShop work again 2016-06-15 21:52:25 -04:00
samczsun
45e6cb902f
Save changes 2016-06-15 21:52:25 -04:00
samczsun
a753a3ab07
Clean up legendary code 2016-06-15 21:52:25 -04:00
Shaun Bennett
cbfbd6fe1c Booster GUI update 2016-06-15 17:40:20 -05:00
Shaun Bennett
cf87469400 Fix a possible NPE, use proper IP and port for api 2016-06-10 20:24:22 -05:00
Shaun Bennett
8bf26dbc11 Use a better podium for NPC, reenable boosters 2016-06-09 18:57:48 -05:00
Keir Nellyer
22dbcbf90d Move util method to sequence CompletableFuture's to new class 'UtilFuture' 2016-06-09 23:41:17 +01:00
Keir Nellyer
8e48b00264 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-06-09 15:16:38 +01:00
Shaun Bennett
d4ac309daa Merge remote-tracking branch 'remotes/origin/master' into feature/gems 2016-06-09 00:29:27 -05:00
Shaun Bennett
09d2c00f66 Proper display of extra gem fountain rewards 2016-06-09 00:14:01 -05:00
LCastr0
cb71bf4ba5 Removes morphs from gadget persistence (PC-429) 2016-06-05 17:44:34 -03:00
Shaun Bennett
4e9a48ab4f Finish off the tip system 2016-05-30 12:02:12 -05:00
Shaun Bennett
e380354bad Refactor CurrencyType 2016-05-29 16:34:21 -05:00
Shaun Bennett
aebcfc2727 Booster tip system 2016-05-28 09:21:10 -07:00
xGamingDudex
4fc3c491f8 Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into feature/mavericks-master-builders 2016-05-28 02:04:27 +02:00
xGamingDudex
1d20e84107 Fixed support for Entities and TileEntities for schematics
Fixed some NBT tools
Added and tested schematic support for entities and tile entities

All conversion and creations for schematics should now also be fixed. So
creating schematics from two points inside a world. Converting
schematics to bytes and converting bytes to schematics.
2016-05-28 01:21:11 +02:00
Keir Nellyer
ad486a7e22 Merge remote-tracking branch 'origin/develop' into feature/report-v2
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/report/ReportCategory.java
2016-05-26 13:24:24 +01:00
xGamingDudex
806fa7fca4 Added MavericksRepository (+ forgot schematic data in last commit)
+Tweaked some MasterBuilders code
2016-05-26 01:19:05 +02:00
xGamingDudex
7a0eea7aa0 Added better saving and loading methods to Schematics
Added some extra NBT utils
Added support for TileEntities and Entities to schematics
2016-05-26 01:17:19 +02:00
cnr
5331e2bec9 Allow PlayerKeyValueRepository Exceptions to propagate 2016-05-25 17:59:20 -05:00
cnr
857cf6ad30 Add PlayerKeyValueRepository and BukkitFuture
PlayerKeyValueRepository<V> is a key/value store whose keys are Strings
and whose value type is parameterized by V. Each repository is backed by
a MySQL table in the Accounts database.

Access to PlayerKeyValueRepository's values is restricted via
CompletableFuture to enforce async database access.

BukkitFuture contains helpful utilities for producing, transforming, and
terminating CompletableFutures with actions on the main thread. A
typical PlayerKeyValueRepository action may look similar to the
following, where we retrieve all key/value pairs for a player and
perform an action with the result on the main thread:

    PlayerKeyValueRepository<String> repo = [...]; // init repo
    UUID uuid = [...]; // a player's UUID

    repo.getAll(uuid).thenCompose(BukkitFuture.accept(values -> {
        // this will be run on the main thread!
        // `values` is of type `Map<String,String>`
    }));
2016-05-25 08:35:05 -05:00
samczsun
f32e648691 QA Pass #1
Remove potential main thread IO in ItemMapManager
Don't construct search string if limit is reached
Also cleaned up WorldManager to be more efficient
2016-05-24 13:15:29 -04:00
samczsun
d29d5dd5e4 Actually fix PC-279 2016-05-24 13:15:29 -04:00
Shaun Bennett
434ada2e86 Fix merge issues 2016-05-24 19:14:52 +10:00
Shaun Bennett
1377e6724f Merge with develop 2016-05-24 19:10:55 +10:00
Shaun Bennett
b6376cae2f Remove googles http api (no longer needed) and add apache http to core.common 2016-05-24 17:23:17 +10:00
Shaun Bennett
12c5ba80b7 API Endpoints, Web calls, Gem Fountain Schematics, Game Menu Update, Booster implementation 2016-05-24 17:13:33 +10:00
Ben
5448c42e45 [Assassin/Recall] Don't allow use when in water [PC-360] 2016-05-23 23:46:33 +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
Shaun Bennett
efb264dd75 Hook into Booster API 2016-05-20 16:58:58 +10:00
cnr
7f44281441 Merge branch 'develop' into project-cosmetics 2016-05-19 10:04:19 -05:00
Shaun Bennett
012edfed45 Use loaded schematics to display fountain progress 2016-05-18 18:04:21 +10:00
Shaun Bennett
8d7ef7cc9a Fix UtilBlock setting ghost blocks 2016-05-18 18:03:54 +10:00
cnr
6042be2d2f Refactor clans ban functionality and remove UtilStreams 2016-05-17 05:57:27 -05:00
xGamingDudex
f8d5bd3c11 Fixed treasure chests
Items would sometimes pop out of chest blocks
You could open illuminated chests before they were converted to real
chests
2016-05-16 00:51:33 +02:00
xGamingDudex
14f7e64a77 Fixed Animator and removed duplicate test call in Game.java 2016-05-15 21:05:37 +02:00
xGamingDudex
d850bed725 Minor code tweaking
* Made reward manager ammo multiplier private final field
* Removed old commented code from WinEffectPodium, WinEffectLavaTrap,
ParticleMusic, ParticleEmerald, ParticleBlood
* Cleaned up the GameModifierMineStrikeSkin filter
* Removed unused Math#isBetween(double, double, double) method
* Changed Animator to use PriorityQueue
2016-05-15 19:43:07 +02:00
xGamingDudex
29a0ba565b Added better hollow calculations to ShapeBox and UtilBlock 2016-05-15 17:05:11 +02:00
xGamingDudex
296f304d29 Changed the way UtilItem.dropItem handles despawning 2016-05-15 17:04:50 +02:00
xGamingDudex
a8db293bcf Moved JavaDocs from ICosmeticShape (now removed) to CosmeticShape 2016-05-15 17:04:25 +02:00
xGamingDudex
97f82e422d Merge branch 'project-cosmetics' of
ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into
project-cosmetics

Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/animation/Animator.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/animation/AnimatorEntity.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ICosmeticShape.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ShapeWings.java
2016-05-15 16:03:36 +02:00
xGamingDudex
aa36097729 Made Animator abstract and added final modifiers 2016-05-15 15:58:05 +02:00
xGamingDudex
abddc446fd Added java docs and tweaked code
* Fixed possible duplication bug in MulitBlockUpdaterAgent
* Tweaked some of the factor methods for Shape.java
* Cleaned some code in ShapeWings.java
2016-05-15 15:32:44 +02:00
LCastr0
1cc44d1b3e Fixes for the following classes:
KitGameModifier
KitModifierType
MultiBlockUpdaterAgent
Shape
GadgetManager
KitModifierType
HatLovestruck
HatSecretPackage
SetLove
Animator
AnimatorEntity
AnimationPoint
ICosmeticShape
UtilText
KitGameModifier
KitModifierType
Removed build.xml and org.eclipse.jdt.ui.prefs
2016-05-15 00:20:07 -03:00
LCastr0
20b9f428b4 Fixes Illuminated Chest's Lore
Fixes Pinata Burst not being saved
Fixes AWP Asiimov and XM1014 Tranquility materials
Removes Fireworks WinRoom
Changes prices of things from 1 shard to Treasure Chest
More unused imports removed
Fixed ANGLE_WING_PATTERN -> ANGEL_WING_PATTERN
Adds javadoc to UtilColor.applyColor()
Adds javadoc to UtilColor.getNextColor()
defaultLeatherColor -> DEFAULT_LEATHER_COLOR
Adds suggestions for UtilColor
Adds final modifier to _worldBorders (UtilPlayer)
Changed _worldBorders key from String to UUID
Adds suggestion for UtilPlayer
Adds final modifier to _type (GameModifierSubPage)
Adds final modifier to _type and _kitType (KitGameModifierPage)
DefaultDencity -> DefaultDensity (Shape)
Changed <Vector> to <> (Shape)
dencity -> density (ShapeBox, ShapeGrid, ShapeSphere)
Using speed and count in constructor (ShapeWings)
Removed empty constructor (WorldGenCleanRoom, MultiBlockUpdaterAgent)
Adds final modifier to all fields (AnimationPoint)
2016-05-14 01:18:37 -03:00
xGamingDudex
2db98613ab Cosmetic Update
* Redid the Reward manager
	Added new rewards to the chest and changed some values
* Fixed some MineStrike skin bugs
* Removed particles/death effects from Minestrike
* Removed old test minestrike skins
* Moved minestrike skins to correct package
* Changed the illuminated chest animation a bit
* Fixed other minor bugs
2016-05-12 23:42:37 +02:00
Keir Nellyer
b68127b111 Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 2016-05-08 00:37:59 +01:00
Shaun Bennett
60dce9ef1b Change LT, Owner, Developer, Admin to DARK_RED 2016-05-06 13:43:30 +10:00
xGamingDudex
17a4517e71 Merge remote-tracking branch 'origin/develop' into project-cosmetics
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
2016-05-05 21:03:15 +02:00
xGamingDudex
1a96ea3c18 Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics 2016-05-05 20:29:28 +02:00
xGamingDudex
db21c7dd22 EGit FTW!
Git, you are the greates, randomly deciding not to include everything
when I spesify you to do so....

This should have been part of prev commit.
2016-05-05 20:26:00 +02:00
xGamingDudex
875fb4eccd The big bug fix batch
+ Added some text utils
+ Added angel wing shape

* Tweaked the wing particle effects.
* Fixed item tool not despawning items in arcade servers
* Removed strange gadget disable
* Updated some death/win effects and particles
* Added Illuminated chest
* Added MS skin name to death message
2016-05-05 20:07:29 +02: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
LCastr0
055b8684c2 - Added action bar message when booster is ready (Wind Up Suit)
- Moved each suit to an individual package, to make it easier to work with
- Removed some unused imports
- Added util to get entity egg data
- Added kit modifiers: Beastmaster, Horseman and Necromancer (SG), Apple (Bridges)
- Added specific kit pages to game modifier menu
2016-05-02 00:13:06 -03:00