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

7995 Commits

Author SHA1 Message Date
AlexTheCoder d59882007b Slightly increase boundaries 2016-07-21 13:55:09 -04:00
AlexTheCoder 37cf863625 Tiny fixes 2016-07-21 13:46:13 -04:00
AlexTheCoder 57f9f7db4b Fix ClassCastException 2016-07-21 13:25:17 -04:00
AlexTheCoder ff210271c9 Add javadocs 2016-07-20 12:21:15 -04:00
AlexTheCoder 0b4c9d78ff Finalize game integration into map 2016-07-20 11:22:14 -04:00
AlexTheCoder 0eac157701 Implement basketball features in the hub and begin setting up coordinates 2016-07-19 12:45:38 -04:00
AlexTheCoder 5ecfaef413 Merge branch 'feature/mavericks-master-builders' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game 2016-07-18 16:28:22 -04:00
xGamingDudex 4aad663bec Left over from merge 2016-07-08 03:59:16 +02: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 d276d8ca5d Removed "Failure" feature and cleaned some code 2016-07-08 03:40:37 +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
xGamingDudex 2659e9be09 Removed failure and smaller updates 2016-07-08 02:06:34 +02:00
cnr 443576ba1a Update YouTube link and send shard reward message 2016-07-06 20:15:41 -05:00
samczsun 63b6158fe4 More UHC Fixes 
Fixes:
PC-137
PC-138
PC-497
PC-665
PC-710
PC-719
PC-754
Also fixes chunk synchronization issue, plugs potential memory leaks

Fancy spectating

Use enum priorities
 2016-07-06 15:55:12 -04:00
Shaun Bennett 8cf470cfd0 Update fountain goals 2016-07-06 13:39:56 -05:00
cnr 17f89f6937 Merge branch 'project-cosmetics' into develop 2016-07-06 13:00:29 -05:00
LCastr0 63500c19c9 Removed commented lines 
Added javadocs to GadgetChangeEvent
 2016-07-06 14:45:05 -03:00
LCastr0 67adb34311 Fixes for the WinRooms 
Removed Freedom Chests from the menu
 2016-07-06 00:00:50 -03:00
Thanos Paravantis 0eab6db116 Soccer bug fixes and minor improvements 
- Slimeball will no longer be able to get stacked.
- Players in soccer mode will not able to stack others.
- Guardian lazer can no longer be used in the soccer field.
- Players in soccer won't get knockback, except if they double jump.
 2016-07-05 15:39:10 -05:00
Connor James c0680b3511 Merge pull request #130 from Mineplex-LLC/bugfix/mopple-sprint 
Numerous Bug fixes
 2016-07-05 10:01:58 -05:00
Sam 295711d626 PC-632 
Fixes an issue where going under the map in Wither Assault would cause
you to have negative speed and not be able to move
 2016-07-04 20:31:59 +01:00
Sam 5644589b10 PC-541 
Covers all possible eventualities of redstone ore and glowing redstone
ore
 2016-07-03 20:57:58 +01:00
Sam e96f7f1217 PC-508 
Fixes a hit box issue with Rocket Slimes
 2016-07-03 15:58:54 +01:00
Sam bdc049efe1 PC-508 
Fixed an NPE with Inferno
 2016-07-03 15:58:19 +01: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
LCastr0 9990e15244 Merge pull request #128 from Mineplex-LLC/develop 
Merge develop into project-cosmetics
 2016-07-02 13:07:03 -03:00
Sam 26361eaee0 PC-508 
Fixes certain abilities in Team SSM that could be used to
damage/knockback other team members
 2016-07-02 13:38:22 +01:00
Sam 8d8824446d PC-519 
Fixes an issue where grenades would not do damage after you die.
 2016-07-02 12:12:15 +01:00
AlexTheCoder 2b74ec00b4 Change display menu for CUST-1 server to reflect recent updates 2016-07-02 01:32:47 -05:00
AlexTheCoder e4c94f5421 Fix whitelist for Customer Support servers 2016-07-02 01:32:42 -05:00
AlexTheCoder 5e994e37da Fix Monster Maze jumping mechanics (Fixes PC-711 and PC-634) 2016-07-01 16:37:03 -05:00
samczsun f6d882fcb4 Disallow placing throwing tnt 2016-06-30 21:12:12 -05:00
samczsun c442376ccc Oops 2016-06-30 22:04:34 -04:00
AlexTheCoder 005189c2d4 Edit kit items in OITQ to fix bow instant charge glitch (Fixes PC-203) 2016-06-30 17:41:09 -05:00
AlexTheCoder b0303a8870 Create new equations for Protection Enchantment functionality to make it work properly (Further fix for PC-311) 2016-06-30 17:41:09 -05:00
AlexTheCoder 37e50df948 Make kits ensure association with players using them (Fixes PC-588) 2016-06-30 17:41:09 -05:00
AlexTheCoder 9c4b787436 Make protection enchantments actually protect wearer from damage (Fixes PC-311) 2016-06-30 17:41:09 -05:00
AlexTheCoder 36bb0b9ae8 Force player visibility to refresh in games over a steady rate (Fixes PC-497) 2016-06-30 17:41:09 -05: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 0393e682c3 Merge clean up 
Every bloody time there are files who don't want to join the rest in the
merge commit.... >.>
 2016-06-30 23:10:28 +02: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
xGamingDudex 03511a7234 Updated values 
Updated teleport mav world value to fit new version of the map.
Split themes of multiple words to new lines.
Fixed bug where 16+ long lines on scoreboard would get random colors.

Seem to have forgotten to include the MavWorldManager earlier... ups.
 2016-06-30 22:56:26 +02:00
Sam 40124b2cdd Updated changed method name (getThrower) 
In the ProjectileData class GetThrower was changed to getThrower, this
fixes that in any of my classes
 2016-06-30 17:19:53 +01:00
Sam 69bd4006d4 Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple-sprint 2016-06-30 17:14:38 +01: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
Thanos Paravantis e25a6e4327 Reset leap data when needed (death/quit/game end) 2016-06-30 05:18:39 -05:00
Thanos Paravantis 5c60819179 Prevent NPE on player interact event 2016-06-30 05:18:39 -05:00
xGamingDudex f9208b67ef Added schematic support for ground in MB. 
Also fixed an NPE and moved a constructor to protected.
 2016-06-29 15:19:46 +02:00
xXVevzZXx 880ac6b88f Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into bugfix/general-bugfixes 2016-06-29 06:21:18 +02:00