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

823 Commits

Author SHA1 Message Date
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
AlexTheCoder 2615ef74dd Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-07-21 05:09:54 -04: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
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
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
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
samczsun d739df8623 UHC is faster now 2016-06-21 22:21:27 -05: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
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
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