Commit Graph

12546 Commits

Author SHA1 Message Date
AlexTheCoder
1fc6936ad6 Fixed merge conflicts 2017-12-29 01:07:27 -05:00
Spencer
e7d8596174 Re-enable blade vortex's usage on teammates via GI request 2017-12-29 01:07:27 -05:00
AlexTheCoder
c3e03b8bc3 Fixed merge conflicts 2017-12-29 01:07:27 -05:00
AlexTheCoder
8ca9a87593 Fixed merge conflicts 2017-12-29 01:07:27 -05:00
Spencer
0fc99b39a2 Remove unnecessary generics in _minions 2017-12-29 01:07:27 -05:00
Spencer
131369cebe Finish TargetCancel inside PerkSkeleton
Should prevent skeletons from attacking teammates
2017-12-29 01:07:27 -05:00
Spencer
fa72dc60dd Disable blade vortex's effect on teammates 2017-12-29 01:07:27 -05:00
Spencer
aecf04483e Overcomplicate teleporting in team SG
Should (should) keep teammates together but actual teams separate.
2017-12-29 01:07:27 -05:00
Spencer
940efc6163 add SurvivalGames#deathmatchTeleport so TeamSG can have different behavior 2017-12-29 01:07:27 -05:00
Spencer
bef403a72c use teleportUniform in Build 2017-12-29 01:07:27 -05:00
Spencer
16905240e9 add UtilPlayer#teleportUniform 2017-12-29 01:07:27 -05:00
Spencer
81db11a640 Reverse cleave's elapsed return 2017-12-29 01:07:27 -05:00
Sam
3749a77b06 Remove squids from the mob gun 2017-12-29 00:50:47 -05:00
Sam
93d7257ce9 Added Mob Bomb Gadget 2017-12-29 00:50:47 -05:00
Sam
8f5a8e882e Show the ender pearl cooldown in the action bar if the player has another ender pearl 2017-12-29 00:22:26 -05:00
Sam
d59c176e5d Prevent anvil interaction 2017-12-29 00:22:26 -05:00
Sam
c478c8f413 Place barrier blocks within the shop npc hitboxes 2017-12-29 00:22:26 -05:00
Sam
c74a754a91 Prevent players duplicating snowballs 2017-12-29 00:22:26 -05:00
Sam
0fa77e741f Fix wrong variables 2017-12-29 00:22:26 -05:00
Sam
42f4b0bb1e Replace the punch 4 bow with power 4 2017-12-29 00:22:26 -05:00
Sam
0aa1d41bb9 Change Cake Wars knockback back to it's previous value 2017-12-29 00:22:26 -05:00
Sam
0657aed11f Prevent team trolling 2017-12-29 00:22:26 -05:00
Sam
6522572fe3 Make sure the snowballs say the name 2017-12-29 00:22:26 -05:00
Sam
ceb85a9657 Make sure snowballs do 1 health to ensure damage manager picks it up 2017-12-29 00:22:26 -05:00
Sam
c225fc1df4 Increase knockback by roughly 25% 2017-12-29 00:22:26 -05:00
Sam
7753f536e5 Frosting Kit 2017-12-29 00:22:26 -05:00
AlexTheCoder
54b27fcb9d Enable Christmas Double XP + Gems 2017-12-22 05:26:25 -05:00
Sam
90b4d003ec Fix the paintball gun gadget teleporting players 2017-12-22 05:25:44 -05:00
Sam
8ec7d92290 Fix Daze Potion doing insane damage 2017-12-19 00:40:56 -05:00
AlexTheCoder
e09f7fcb5d Vastly speed up stat converter 2017-12-19 00:39:38 -05:00
AlexTheCoder
fc5d7754bf Disable scaffold checks 2017-12-18 04:35:25 -05:00
AlexTheCoder
a2ddee1336 Formatting fix 2017-12-14 00:48:12 -05:00
AlexTheCoder
ac69fb275c Update Christmas Chaos II resource pack for versions above 1.8 2017-12-14 00:48:12 -05:00
AlexTheCoder
d1f4cf0f40 Update the customer support whitelist 2017-12-14 00:48:12 -05:00
Dan Mulloy
a4aae7f6ae Unload chunks every 60 seconds 2017-12-14 00:30:32 -05:00
Sam
6362033b9e Stop player's dropping leather armour 2017-12-14 00:29:58 -05:00
Sam
0714399dcf Off by 1 durability issue 2017-12-14 00:29:58 -05:00
Sam
a72dcbb338 Format the ender pearl item to inform players of the cooldown 2017-12-14 00:29:58 -05:00
Sam
00d4cad623 Don't need to else if here 2017-12-14 00:29:58 -05:00
Sam
96263ebf5b Inform players of the ender pearl cooldown 2017-12-14 00:29:58 -05:00
Sam
d885f83159 Change the ender pearl cooldown to 10 seconds 2017-12-14 00:29:58 -05:00
Sam
e4f85eb2b2 Give the golden pickaxe a name 2017-12-14 00:29:58 -05:00
Sam
da32180f32 Remove spawn protection when a player attacks 2017-12-14 00:29:58 -05:00
Sam
c1fc0fb100 Add a new game tip 2017-12-14 00:29:58 -05:00
Sam
7e6dbed17e Fix the teammate message not appearing if there were an odd number of players 2017-12-14 00:29:58 -05:00
Sam
b8d0353a01 Unused imports 2017-12-14 00:29:58 -05:00
Sam
2df02c7030 Actually test the changes made 2017-12-14 00:29:58 -05:00
Sam
ac0c1f8fad Fix spawn protection 2017-12-14 00:29:58 -05:00
Sam
32c4bf1c20 Changes for Cake Wars 1.2 2017-12-14 00:29:58 -05:00
Dan Mulloy
7a42830024 Fix null pointer when game is force stopped 2017-12-14 00:26:34 -05:00