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

9231 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
samczsun
ceb62f8dc9 Fix lore 2016-07-02 18:41:20 -04:00
AlexTheCoder
b3c230082a Allowed Meridian Scepter to damage non-player entities 2016-07-02 18:34:35 -04:00
AlexTheCoder
1ce6f3f65f Stop webs from editing banners (PC-610) 2016-07-02 18:16:04 -04:00
AlexTheCoder
ffdc7b4be0 Temporarily patch random nullpointer 2016-07-02 18:05:26 -04:00
AlexTheCoder
9898b3d95d Fix block state not saving on restore (Untested) (PC-610) 2016-07-02 18:02:59 -04:00
AlexTheCoder
32c91e2e0c Make start command more informative 2016-07-02 17:52:04 -04:00
AlexTheCoder
d4be749edc Update Iron Wizard attack priority to use Earthquake when surrounded, lower blocks thrown during Cave In and implement Iron Skin arrow resistance 2016-07-02 17:47:19 -04:00
samczsun
1655811d43 Added help messages to WorldEvent command 2016-07-02 17:47:13 -04:00
samczsun
54cda56c11 Initial Commit 2016-07-02 17:16:42 -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
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
Thanos Paravantis
e2663d6448 Move spawn related methods to challenge classes 2016-07-01 17:18:03 +03:00
Thanos Paravantis
6fdbda0ed0 Refactor Dogs Vs Cats challenge 2016-07-01 17:04:06 +03:00
Thanos Paravantis
8101fced7b Detect correct volley pig block and fix its spawn 2016-07-01 13:58:21 +03:00
Thanos Paravantis
568cbb2672 Prevent infinite spawn search loops by /mark cmd 2016-07-01 12:32:31 +03:00
Thanos Paravantis
7379b2069b Make volley pig map size and spawns dynamic 2016-07-01 12:31:41 +03:00
Thanos Paravantis
baca63dcae Merge branch 'develop' into thanos-mineware 2016-07-01 11:43:56 +03: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
Keir Nellyer
fbc1724111 Rewrite this condition to make more sense 2016-06-30 17:51:16 -04:00
Keir Nellyer
82894eacaa Remove todo as this is confirmed working 2016-06-30 17:43:06 -04:00
Keir Nellyer
164d1c580d Check if date time is before correctly 2016-06-30 17:40:12 -04:00
Keir Nellyer
7db7c0914e Get time since report has been created 2016-06-30 17:23:29 -04: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
Keir Nellyer
c076a46078 Show all involved users correctly 2016-06-29 22:13:13 -04:00
Keir Nellyer
1c73d2a793 Fix age of report not showing when no chat messages 
Use a dummy value for now until I get the system to calculate the age
 of the report.
 2016-06-29 18:16:26 -04:00
Keir Nellyer
a3f4a4c185 Change message for when there are no chat messages for a report 2016-06-29 18:07:26 -04:00
Keir Nellyer
e1a32b6da0 Show error messages for reports which do not have any related chat 
messages
 2016-06-29 18:06:30 -04: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
Keir Nellyer
d2b1a7b0c1 Add todo for handling invalid report number input 2016-06-28 21:50:33 -04:00