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

3892 Commits

Author SHA1 Message Date
Sam
3411a3b978 Throwable Dirt colliding issues 
Fixes the falling dirt block colliding with the thrower.
 2016-07-19 22:28:56 +01:00
Sam
8b552a69de Removal of debug message 2016-07-19 21:45:03 +01:00
Sam
765958a421 Code cleanup for PerkDirtCannon 
Cleans up some bad code in PerkDirtCannon and now removes the dirt
blocks on death.
 2016-07-19 20:51:14 +01:00
Sam
7470078da9 Typo in PerkFireBurst 
Should say Blaze Rod instead of Snowblock
 2016-07-19 20:50:19 +01:00
Sam
588e32e1b1 Addition knockback perk for Earth Kit 
Adds a perk so that the Earth kit takes 75% less knockback while on the
ground
 2016-07-19 20:49:27 +01:00
Sam
0390822fd7 IceBridge item no longer droppable 2016-07-19 20:48:36 +01:00
Sam
63a0eebd02 Increased chance enchanted of armour 2016-07-19 20:48:12 +01: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
xXVevzZXx
370b0693d9 fix the server thinking it's the next week 2016-07-17 05:20:21 -05:00
cnr
0ae4b0c5e0 Temporarily disable anti-xray in UHC 2016-07-16 23:08:18 -05:00
AlexTheCoder
08850d909f Further work on brood mother boss and nether 2016-07-16 21:59:03 -04:00
Sam
e2af4df44b Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-07-16 21:22:57 +01:00
Shaun Bennett
34f718b2ec Fix improper gem/shard reward handling 2016-07-16 06:27:16 -05:00
Sam
30111eb940 Duplicate enchantment fix 2016-07-16 11:16:57 +01:00
Sam
951e07488a GI changes from testing session 2016-07-16 11:15:33 +01:00
Sam
f012e8d4ed Merge from develop 2016-07-16 08:41:15 +01:00
Sam
8523d56bbf Merge fix 2016-07-16 08:33:41 +01:00
Sam
d901fce3ac Experimental Skywars Kits 2016-07-15 23:07:17 +01:00
xXVevzZXx
728a91da0f adding damage outsid ethe loop 2016-07-15 04:57:44 +02:00
xXVevzZXx
3070835662 enable armor protection and fix shotguns 2016-07-15 04:39:53 +02:00
xXVevzZXx
6c7f2d8b0d fix damage in DM prepare, eating grenades and no health regen 2016-07-15 02:28:22 +02:00
cnr
a0847b8d1a Fix null ServerGroup uptimes value for MPSes 2016-07-14 08:08:24 -05:00
cnr
1a2e0df6ca Only allow OPs to use minestrike debug commands 2016-07-14 07:28:33 -05:00
cnr
1d1c3ef1be Merge branch 'thanos-mineware' into develop 2016-07-14 03:41:00 -05:00
Thanos Paravantis
40345bc93c Fix Bawk Bawk Battles game start 2016-07-14 11:23:39 +03:00
cnr
7cc44c8bfc Merge branch 'thanos-mineware' into develop 2016-07-14 00:22:01 -05:00
Thanos Paravantis
906762e9db Remove debug commands 2016-07-14 08:17:36 +03: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
cnr
a7b30f4f59 Merge branch 'thanos-mineware' into develop 2016-07-13 21:26:25 -05:00
Shaun Bennett
a34ac42093 Amplifiers adjustment - shards only 2016-07-13 19:26:23 -05:00
Thanos Paravantis
4e985b85e6 Make final challenge changes 
- Increase Color Change delay
- Make Tag Master not count for players jumping into the void
 2016-07-13 23:59:01 +03:00
Shaun Bennett
369dabffae Amplifier updates - move to boost shards only 2016-07-13 15:07:24 -05:00
Thanos Paravantis
711a04ffa8 Add Bawk Bawk Battles to hub compass 2016-07-13 21:40:31 +03:00
Thanos Paravantis
3497a4c095 Remove unused debug messages 2016-07-13 19:29:48 +03:00
Thanos Paravantis
6c11b718af Remove suppress warnings annotations 2016-07-13 19:03:39 +03:00
Thanos Paravantis
dab3e09837 Achievement fixes, minor challenge changes 
- Fishing Day was marked as deprecated.
- Surf Up will no longer track waves in which players were killed.
- Make Bouncing Shadow not count players that lost.
- Tag Master will now select alive players only.
- Removed debug messages.
 2016-07-13 18:52:14 +03:00
Thanos Paravantis
ad32f4e2f1 Remove unnecessary new string declaration 2016-07-13 18:05:35 +03:00
Thanos Paravantis
839d9263fd Prevent game crash if started with one player 2016-07-13 18:03:38 +03:00
Thanos Paravantis
efce89a7e7 Fix Color Change platforms not removed properly 2016-07-13 17:47:17 +03:00
Thanos Paravantis
2e5d7c023f Fix Tag Master, show bouncing block full score 2016-07-13 17:13:02 +03:00
Thanos Paravantis
6cef42d7a4 Fix merge issues 2016-07-13 13:36:59 +03:00
Thanos Paravantis
179b59af2c Merge branch 'develop' into thanos-mineware 2016-07-13 13:28:03 +03:00
Thanos Paravantis
943dc88ca4 Modify challenge list, change display messages 2016-07-13 13:23:15 +03:00
cnr
e40abd4859 Merge branch 'thanos-mineware' into develop 2016-07-13 05:04:50 -05:00
Sam
2f6e140b34 Item in hand change (Devourer) 
Changes the item in the NPC's hand for Devourer from OBSIDIAN to a
DIAMOND_CHESTPLATE
 2016-07-12 21:57:37 +01:00
Sam
5382afedda Sharpshooter arrow limit changed to 4 2016-07-12 21:56:25 +01:00
xXVevzZXx
654ab281ea Add option of "uptimes" to servergroups 2016-07-12 15:44:29 -05:00
Thanos Paravantis
0f3b2da8b7 Fix Bouncing Block, re-add features for testing 2016-07-12 23:02:01 +03:00
cnr
daddaa477e Merge branch 'update/brawl-games' into develop 2016-07-12 06:45:32 -05:00
xXVevzZXx
9cf5a6fb9e Fix Absorption in OP MB, add more arrows to OP MB, fix not being able to purchase primary weapon in MS, fix skin bug in MS and fix helmet drop when scoping in Strike Games 2016-07-12 05:39:21 +02:00
xXVevzZXx
ac8a920484 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/brawl-games 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/GunModule.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Gun.java
 2016-07-12 03:07:31 +02: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
Sam
f40299e402 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-07-11 18:34:48 +01:00
Thanos Paravantis
6a87be13f0 Remove features that contain bugs 2016-07-11 01:02:19 +03:00
Thanos Paravantis
416b978c4f Apply chicken attack and completion improvements 
- Chicken spectators will no longer receive the compass to prevent
them from teleporting near players.

- The winner of the game will not see the
"You have completed the challenge." message
as the game will end afterwards.
 2016-07-10 15:16:17 +03:00
Thanos Paravantis
5a7e7c7623 Challenge bug fixes and improvements 
- Added crumble feature to Block Lobbers
- Increased TNT height on Water Horror
- Increased Lava Run difficulty
- Fixed unclickable Bawk's Food Kit
- Fixed chickens not attacking properly on chicken attack
- Fixed dominant team not winning on team based challenges
- Fixed spectators being able to break blocks on Treasure Digger
 2016-07-10 13:32:24 +03:00
Thanos Paravantis
a9f41ab269 Refactor project classes 2016-07-09 12:00:06 +03:00
Sam
34565b2975 PC-699 
/bc in MPS is now protected by the filter
 2016-07-08 22:09:48 +01:00
Sam
07b65ad1c9 PC-621 
Doors can now be opened in Block Hunt
 2016-07-08 21:01:15 +01:00
Sam
af9611dcfd Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple 2016-07-08 21:00:34 +01:00
Thanos Paravantis
331c1bcf91 Merge branch 'develop' into thanos-mineware 2016-07-08 22:29:59 +03:00
Thanos Paravantis
7887c96cc9 Decrease delay between challenges 2016-07-08 22:28:53 +03:00
Thanos Paravantis
7ba7414101 Improvements, refactoring and bug fixes 
- Fixed heights not being calculated correctly on Kangaroo Jump.
- Fixed platform not being removed entirely on Color Change (needs confirmation).
- Fixed death effect items not spawning on Treasure Digger.
- Fixed TNT not reaching players on Water Horror.
- Fixed Dogs Vs Cats hologram being displayed continuously (flashing) (needs confirmation).
- Increased score hologram elevation rate.
- Spawn locations are automatically centered.
- Border is now far away from challenges.
- Refactored main game class.
 2016-07-08 21:30:43 +03:00
TadahTech
ce72d25832 Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 2016-07-08 13:09:02 -05:00
Sam
42c578be9d PC-612 
Fixes an issue that removing Co-host from someone would remove their
creative mode in Master Builders.
 2016-07-08 17:54:42 +01:00
Sam
c16f9ec9ec PC-688 
Changes the description in Draw My Thing so that it reflects changes
made to the tip system.
 2016-07-08 17:53:22 +01:00
Sam
c607654c51 PC-692 
Fixes an issue that allowed staff spectators to damage the King in
Castle Siege
 2016-07-08 17:50:33 +01:00
Sam
7940eeb0ee PC-633 
Allows humans in Wither Assault to place blocks under the map, allowing
them to no longer get stuck
 2016-07-08 17:49:38 +01:00
Sam
aae24d862a Revert "PC-692" 
This reverts commit 7865b1ef80.
 2016-07-08 17:38:53 +01:00
Sam
7865b1ef80 PC-692 
Allows humans in Wither Assault to place blocks anywhere so that players
are not able to get stuck in the ground
 2016-07-08 17:37:32 +01: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
Sam
da9ad913b2 Finalisation of update 2016-07-07 23:03:23 +01:00
xXVevzZXx
783b20a0dc Disable champions abilities in smash dom and disable supply chests, adjust peace announcement in Strike games, Absorbtion fix in OP MB, Countdown in CHanging Kits, more Arrows in OP MB, regen hunger in skysmash, scoped players drop helmets now, fix stuff with identifiers in GunModule 2016-07-07 15:08:57 +02: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
cnr
17f89f6937 Merge branch 'project-cosmetics' into develop 2016-07-06 13:00:29 -05:00
Thanos Paravantis
04f0ef199c Make CustomFirework singleton class public 2016-07-06 20:47:28 +03:00
LCastr0
63500c19c9 Removed commented lines 
Added javadocs to GadgetChangeEvent
 2016-07-06 14:45:05 -03:00
Thanos Paravantis
989dd98212 Fix players not losing on Pick a Side 2016-07-06 20:41:26 +03:00
Thanos Paravantis
6a66d6cc92 Lower barrier spawn chance on Cloud Fall 2016-07-06 20:40:51 +03:00
Thanos Paravantis
7319965c45 Temporarily fix challenge completion/lose issues 2016-07-06 20:40:15 +03:00
Thanos Paravantis
47f62e2c89 Make lava run a bit more difficult 2016-07-06 20:39:37 +03:00
xXVevzZXx
36285ee101 Improve GunModule with editable variables 2016-07-06 18:55:13 +02:00
xXVevzZXx
4dedd27227 finish up editing of arrays for gamemodes 2016-07-06 18:34:15 +02:00
Thanos Paravantis
185ba600ca Merge branch 'develop' into thanos-mineware 2016-07-06 17:48:31 +03:00
Thanos Paravantis
e326fd322c Update Pick a Side, refactor Reverse Tag 2016-07-06 17:45:51 +03:00
Thanos Paravantis
29434b786e Apply completion/lost bug fixes 2016-07-06 17:45:22 +03:00
xXVevzZXx
3e77ce0f00 make arrays parseable by variables 2016-07-06 14:03:41 +02:00
xXVevzZXx
a430f7e94d Add chat messages for Peace Phase, remove arrows from chests, disable crafting, fix dropped pumpkins and disable weapon enchantments 2016-07-06 13:45:31 +02:00
Thanos Paravantis
ab4174cfb9 Refactor Red Light, Green Light and Volley Pig 2016-07-06 12:04:04 +03:00
Thanos Paravantis
e0d133ab67 Broadcast a message when timer runs out 2016-07-06 11:10:57 +03:00
Thanos Paravantis
de74716abf Refactor Treasure Digger and Volley Pig 2016-07-06 11:10:21 +03:00
Thanos Paravantis
ae60d05bbb Refactor Wave Crush 2016-07-06 10:25:20 +03:00
Thanos Paravantis
b40346417a Remove unused project files 2016-07-06 10:25:05 +03:00
LCastr0
67adb34311 Fixes for the WinRooms 
Removed Freedom Chests from the menu
 2016-07-06 00:00:50 -03: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
Thanos Paravantis
607b92984e Fix hologram elevation speed 2016-07-05 23:18:29 +03:00
TadahTech
9f58e57a67 Bug fixes. 2016-07-05 14:35:37 -05:00
Thanos Paravantis
00c3584c0b Make score holograms elevate faster 2016-07-05 21:14:13 +03:00
Thanos Paravantis
6a8c30d496 Refactor Mini OITQ and Water Horror 2016-07-05 21:13:49 +03:00
Thanos Paravantis
071f0c4de7 Refactor Ore Run and Rush Push 2016-07-05 19:39:30 +03:00
Thanos Paravantis
f36244efc6 Refactor Lava Run and Milk a Cow 2016-07-05 19:27:59 +03:00
Thanos Paravantis
108031acf1 Refactor Kangaroo Jump and King of the Ladder 2016-07-05 18:53:53 +03:00
Thanos Paravantis
f64234e4d1 Refactor Falling Blocks and Fast Food 2016-07-05 18:14:31 +03: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
Thanos Paravantis
ba02c94e08 Refactor Dogs Vs Cats and Egg Smash 2016-07-05 17:00:38 +03:00
Thanos Paravantis
5d01bc2863 Refactor Deadly TNT and Diamond Hunt 2016-07-05 16:30:51 +03:00
Thanos Paravantis
fe89a0f094 Refactor Cloud Fall and Color Change 2016-07-05 16:17:19 +03:00
Thanos Paravantis
361e857bc7 Refactor Build Race and Chicken Shooting 2016-07-05 15:54:43 +03:00
Thanos Paravantis
3f13c5f518 Refactor Block Lobbers and Bouncing Block 2016-07-05 14:52:25 +03:00
Thanos Paravantis
4789f640b2 Refactor Anvil Dance and Arrow Rampage challenges 2016-07-05 13:57:05 +03:00
Thanos Paravantis
ce3117ba4b Fix anvils staying on map after challenge end 2016-07-05 13:03:42 +03:00
Thanos Paravantis
9f45c0a622 Use offset2d instead of offset 2016-07-05 13:03:02 +03:00
Thanos Paravantis
9cec81ee34 Define border after challenge is started. 
Previously, the border was defined in the challenge constructor,
as a result the boundaries were not set correctly. That's because
the map center on each challenge is defined in the constructor, and
since the super one is called before the challenge constructor, the map
center which defines part of the border was not correct.
 2016-07-05 12:35:27 +03:00
Thanos Paravantis
dd55d96ccf Delay glass removal when obsidian is far away 
On Lava Run, when obsidian is generated far away from the last
created obsidian block, a delay of 1 second will be added to the
total delay until the platform is removed, because normally glass
is removed very quick.
 2016-07-05 12:32:44 +03: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
Thanos Paravantis
d393ffcc51 Update debug commands for Sr.Mods 2016-07-04 22:06:01 +03:00
Thanos Paravantis
4397784f35 Add new challenge completion effect 2016-07-04 22:05:34 +03:00
TadahTech
06feb615a9 Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 2016-07-04 04:18:01 -05: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
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
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
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
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
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
xGamingDudex
32ee27d9ee Small bugfixes with QA 
Never re-show reviewed builds in review-server.
Toggle debug messages in review-server.
Fixed minor bugs with QA
 2016-06-29 03:49:53 +02:00