Commit Graph

8073 Commits

Author SHA1 Message Date
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
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
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
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
LCastr0 671dcaf3aa Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-06-28 18:14:05 -03:00
LCastr0 324a967135 Merge pull request #118 from Mineplex-LLC/develop
Merge develop into project-cosmetics
2016-06-28 18:13:09 -03:00
LCastr0 24186d9992 More fixes for gadget persistence 2016-06-28 18:11:00 -03:00
Keir Nellyer 561734e7fe Remove unused imports (accidentally added) 2016-06-27 21:18:40 -04:00
Keir Nellyer 128f6af83d Show time of last report and time since 2016-06-27 18:15:41 +01:00
Keir Nellyer 48a2d0d304 Remove old completed todo 2016-06-27 18:06:01 +01:00
Keir Nellyer 42bd2148e5 Don't allow a user to handle more than one report simultaneously 2016-06-27 17:56:01 +01:00
Keir Nellyer dbf0bf35b4 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-06-26 23:00:19 +01:00
Keir Nellyer 90df695624 Merge branches 'feature/report-v2' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-06-26 00:18:07 +01:00
xXVevzZXx fbd9b17ba0 fix playeringametime being 0 2016-06-25 12:35:59 -05:00
LCastr0 30f413d04e Fixes for persistence:
No longer save items after they are disabled
No longer keep the particle effect after a staff vanishes
2016-06-25 02:22:20 -03:00
LCastr0 d75abe3aea Persistence fixes 2016-06-25 00:36:00 -03:00
LCastr0 83f4b25887 Testing persistence fixes 2016-06-25 00:33:36 -03:00
LCastr0 a18976649b Merge pull request #116 from Mineplex-LLC/develop
Merge develop into project-cosmetics
2016-06-25 00:27:01 -03:00
xXVevzZXx 285d94a2ca Fill hotbar editor with glass panes 2016-06-25 04:48:59 +02:00
cnr c430566c6d Never reset a player's YouTube click time locally 2016-06-24 16:59:27 -05:00
Shaun Bennett 94fe9f57d2 Add missing imports 2016-06-24 12:36:56 -07:00
Kenny Goodin dc9145c707 Hotfix, disable youtube and twitter buttons in BonusGUI 2016-06-24 15:33:07 -04: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