Commit Graph

4565 Commits

Author SHA1 Message Date
Sam 0f5fcc7670 Remove entity bots 2017-05-01 10:36:45 +01:00
cnr e65f269a9a Merge branch 'update/kingppc' into develop 2017-04-30 21:11:37 -07:00
cnr 63fae06831 Revert "Enable 2x XP"
This reverts commit 7994ed082e.
2017-04-30 21:09:11 -07:00
LCastr0 a37cf3b1c5 Fixed pets and mounts not having any message when they are inside castle, fixed item despawning, stopped players from placing jukeboxes inside castle 2017-04-30 19:33:38 -03:00
LCastr0 0b2d0d348c Merge branch 'develop' into update/mayitems 2017-04-30 13:38:26 -03:00
LCastr0 91fb50cc8b Fixed conflicts 2017-04-30 12:05:04 -03:00
cnr 6ae6f7b627 Revert "Rate limit book/sign edits as a temporary measure against a crash exploit"
This reverts commit f5cba1eb1e.
2017-04-30 01:54:43 -07:00
Sarah fdee6b1163 Add some more event commands, fix some existing event commands and change permissions for event related commands to be executeable by EVENT_MODERATOR 2017-04-30 01:38:04 -07:00
Sam 0bbd0659a0 Fix the water not being replaced bug 2017-04-30 01:38:04 -07:00
Sam fd31706333 5 seconds rather than 50 2017-04-30 01:38:04 -07:00
Sam ee7a29d387 Stop command spam 2017-04-30 01:38:04 -07:00
Sam f315689dda Staff Oscars 2017-04-30 01:38:04 -07:00
Sam ee8f970673 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-04-29 23:40:16 +01:00
Sam acb5963dd4 Balance changes 2017-04-29 23:25:13 +01:00
Kenny 26c772b8b8 Merge branch '2xXP' into develop 2017-04-29 02:19:40 -04:00
Kenny 7994ed082e Enable 2x XP 2017-04-29 02:16:31 -04:00
Kenny f5cba1eb1e Rate limit book/sign edits as a temporary measure against a crash exploit 2017-04-29 02:05:07 -04:00
Sam 8a54e19695 Fix Fissure skipping snow blocks 2017-04-28 19:30:19 +01:00
Sam 6beeec20d6 Disable morphs when changing kits 2017-04-28 19:30:00 +01:00
Sam 26d97bf7eb Up the water damage check rate 2017-04-28 19:29:23 +01:00
Sam 59699f930e Re-implemented triple jumps 2017-04-28 16:26:02 +01:00
LCastr0 d33aac9fd4 Fixed args 2017-04-27 16:34:35 -03:00
LCastr0 124d22ce31 Added new class for peasants 2017-04-26 22:52:40 -03:00
LCastr0 6bf1b6c1dc Fixed arguments 2017-04-26 16:25:32 -03:00
Sam d3cb99f431 Skeletal Horse converted to Google Sheets 2017-04-26 19:11:48 +01:00
LCastr0 19138eb501 Added castle stuff for hub 2017-04-26 01:12:43 -03:00
Sam 7f1b1d72b9 Chicken converted to Google Sheets 2017-04-25 19:33:00 +01:00
Sam af25aa0b00 Witch converted to Google Sheets 2017-04-25 18:20:34 +01:00
Sam 044a3754cf Fix incorrect key 2017-04-24 23:14:01 +01:00
Sam f16ea648f9 Blazr converted to Google Sheets 2017-04-24 23:13:03 +01:00
Sam 99fa347cf1 Wolf converted to Google Sheets 2017-04-24 20:21:19 +01:00
Sam 27cff85189 Fix Perk variables being overriden when multiple kits used the same perk 2017-04-24 18:04:16 +01:00
Sam 5bc2b9d34c Revert "Make Perks not static, this fixings all kits having the same stats 😨"
This reverts commit 1d0f28689f.
2017-04-24 17:40:48 +01:00
Sam 1d0f28689f Make Perks not static, this fixings all kits having the same stats 😨 2017-04-23 19:06:33 +01:00
Sam c8d891ef31 Snowman converted to Google Sheets 2017-04-23 18:54:29 +01:00
Sam 9e6ab9a696 Enderman converted to Google Sheets 2017-04-23 17:07:45 +01:00
Sam 24b73d27e7 Fix the infinite Giga Slime 2017-04-23 16:10:54 +01:00
Sam 9d48a5f1a5 Creeper converted to Google Sheets 2017-04-23 16:08:45 +01:00
Sam 02ffec8618 Fix players being affected by velocity inside on the spawn island 2017-04-23 14:42:26 +01:00
Sam 09300b499f Adjust the time before the player recieves kit information after death 2017-04-23 14:41:59 +01:00
Sam f1b45bc29e Slime converted to Google Sheets 2017-04-23 14:37:29 +01:00
Sam 43d703d9b7 Spider converted to Google Sheets 2017-04-22 23:53:01 +01:00
Sam 1d7fb77bc4 Deleted some code by accident 2017-04-22 23:10:08 +01:00
Sam e350c62f54 Iron Golem and Skeleton converted to Google Sheets 2017-04-22 23:07:44 +01:00
Sam 2f478e46f3 Fix various bugs found in testing 2017-04-21 21:53:16 +01:00
Sam ca6789d92a Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-04-21 17:35:12 +01:00
Sam 01f74a3e12 SSM Training Ground 2017-04-21 17:35:10 +01:00
Sam 30fb899bee Move debug commands over to the proper system 2017-04-20 18:26:22 +01:00
cnr 87b829b411 Disable easter egg baskets in games 2017-04-19 22:33:32 -07:00
cnr 2263e8bfcb Ignore movement checks in Runner 2017-04-16 01:09:12 -06:00
cnr b30a706543 Disable Skyfall booster kit 2017-04-14 22:33:54 -06:00
cnr c7e855ee16 Merge branch 'feature/eastereggs' into develop 2017-04-13 22:56:41 -06:00
samczsun 498df70a1f Implement basic canDamage 2017-04-13 00:02:32 -06:00
cnr 490fe56b34 Merge branch 'update/skyfall-nolag' into develop 2017-04-12 23:39:01 -06:00
samczsun e1fee19aff Optimize chunk updating and fix invis players 2017-04-13 01:09:05 -04:00
Sarah 4775fccb9a Improve Island rot and misc fixes 2017-04-12 22:35:33 +02:00
AlexTheCoder 5a225b9332 Properly check the spring chest rewards 2017-04-12 16:01:24 -04:00
AlexTheCoder fe1cda820f Merge branch 'update/aprilchest' of github.com:Mineplex-LLC/Minecraft-PC into feature/eastereggs 2017-04-12 16:00:37 -04:00
AlexTheCoder c3ff494f94 Update Arcade and Hub to use skinned easter eggs 2017-04-12 03:06:32 -04:00
LCastr0 1904990f84 Fixed merging issues 2017-04-11 23:16:42 -03:00
AlexTheCoder 9a58cd792e Implement easter egg baskets in games which can give fantastic rewards 2017-04-11 20:18:09 -04:00
LCastr0 6f1c062182 Removed GameType, using GameDisplay instead 2017-04-08 23:06:55 -03:00
LCastr0 8bcb5bc948 Added event to be called when game stops 2017-04-07 14:13:53 -03:00
LCastr0 b441dc5edf Calls event when arcade game starts 2017-04-07 14:12:23 -03:00
LCastr0 6a668004e0 Added game start event to core, to be called inside arcade and handled inside core 2017-04-07 14:06:44 -03:00
Sam 08bd17afe6 Fix a chat formatting problem 2017-04-06 00:36:17 -05:00
samczsun 0cc7a078c6 Fix bad logic in TeamArmorModule 2017-04-06 00:35:49 -05:00
samczsun 36f4e6b5a1 Change more closeInventory calls 2017-04-06 00:35:49 -05:00
samczsun 8e92317b9c So that's why Tim closed inventories 2017-04-06 00:35:49 -05:00
samczsun 9c9d74f098 PC-1394 2017-04-06 00:35:49 -05:00
samczsun fceda64a5a PC-1318 2017-04-06 00:35:49 -05:00
samczsun d69c4b3dca PC-1189 2017-04-06 00:35:49 -05:00
samczsun 4553a7081f PC-697 PC-1180 2017-04-06 00:35:49 -05:00
samczsun e0706f3627 PC-1056 2017-04-06 00:34:34 -05:00
samczsun db59c32b5e PC-1028 2017-04-06 00:34:34 -05:00
samczsun 873cd9c2a5 PC-802 2017-04-06 00:34:34 -05:00
cnr a1fc6bd20f Merge remote-tracking branch 'bugfix/bridges' into develop 2017-04-06 00:33:47 -05:00
cnr 64d5fe3c80 Revert "Revert "Merge branch update/bridges into develop""
This reverts commit 0ad69ebefc.
2017-04-06 00:33:41 -05:00
Sam cbf7985773 Colour the message 2017-04-05 22:58:06 +01:00
Sam c1b83b1065 Braces 2017-04-05 21:46:22 +01:00
Sam 047ed81eea Add a message when a player dies pregame 2017-04-05 21:38:04 +01:00
Sam 1f1ad4c441 Change Diamond ore drops to diamonds 2017-04-05 21:35:04 +01:00
Sarah acd588ff1a Add lucky/unlucky tracks to Skyfall 2017-04-05 04:40:52 +02:00
Sarah e4b79a3731 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/skyfall
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skyfall/Island.java
2017-04-05 04:21:14 +02:00
Sarah 616e2dad0f Fix selection of air blocks when searching for top layer blocks
add some Supply Drop loot
dd /Boost command, fix AntiCheat
don't put duplicates in supply drop
don't crumble rings before the game begins
don't crumble middle rings
2017-04-05 04:15:48 +02:00
samczsun ef21106da0 Fix memory leak in CompassModule 2017-04-01 16:20:59 -05:00
Sam 4c882ae4a8 Fix chat handling elsewhere 2017-04-01 02:11:11 -05:00
Sam 03d781ca70 It be April fools matey, walk yee plank 2017-04-01 02:11:11 -05:00
samczsun c82697a4e3 PC-1396 2017-03-29 23:30:49 -05:00
samczsun 53d9a5f977 PC-1222 2017-03-29 23:30:49 -05:00
samczsun ca452463db PC-1106 2017-03-29 23:30:49 -05:00
samczsun 3ef8c6f532 PC-1101 2017-03-29 23:30:49 -05:00
samczsun 8226592caa PC-1026 2017-03-29 23:30:49 -05:00
samczsun 8a78f1ce34 PC-1026 2017-03-29 23:30:49 -05:00
samczsun 858b08e3c3 PC-825 2017-03-29 23:30:49 -05:00
samczsun 8521691cfb PC-817 2017-03-29 23:30:49 -05:00
samczsun c95fea066c PC-778 2017-03-29 23:30:49 -05:00
samczsun e45e27ba34 PC-629 2017-03-29 23:30:49 -05:00
samczsun 66e3a7ad5c PC-587 2017-03-29 23:30:49 -05:00
samczsun 1ecd46f7ee PC-372 2017-03-29 23:30:49 -05:00
Sam fff18ef2a0 Revert "Make appler ignore damage rate"
This reverts commit e0819bfd7d.
2017-03-27 19:19:45 +01:00
Sam e0819bfd7d Make appler ignore damage rate 2017-03-27 19:14:07 +01:00
Sam 421d76b7f3 More changes! 2017-03-27 19:08:31 +01:00
Sam 28fa092b20 Additional kit changes 2017-03-26 13:39:12 +01:00
Sam 60231c817f Missed a class 2017-03-25 16:05:58 +00:00
Sam 02a6f34bd3 Destructor changes 2017-03-25 16:05:16 +00:00
Sam 5564dc7daf Fix even more bugs 2017-03-25 13:57:20 +00:00
Sarah b389041392 Change some more loot, not weapon doubles, 25% more boost from booster rings, fixed decay times for rings, let the complete surface of islands rot at once, specific items come with another item and a dynamic rot rate 2017-03-24 18:04:44 +01:00
LCastr0 d2851b0708 Merge branch 'develop' into update/aprilchest 2017-03-24 14:01:15 -03:00
Sam 8bddad44da Bridges hotfix 2017-03-24 16:46:14 +00:00
cnr 0ad69ebefc Revert "Merge branch update/bridges into develop"
This reverts commit 7e8f5b4939, reversing
changes made to 222e4267d2.
2017-03-23 23:24:00 -05:00
AlexTheCoder 3ebfb453c5 Implement rank and powerplay linking to the website and give specific ranks an id corresponding to their respective forum tag 2017-03-23 23:18:29 -05:00
Sam 401276d705 Missing isLive check 2017-03-22 23:04:50 +00:00
Sam 1c620048ca Merge remote-tracking branch 'refs/remotes/origin/develop' into update/bridges 2017-03-22 14:14:30 +00:00
Sam c4c7ebe1e6 Check for blocks already registering 2017-03-20 22:10:20 +00:00
LCastr0 defece04a9 Fixed some issues changing Creature to Entity 2017-03-20 16:33:20 -03:00
Sarah f8f7c04f58 Improve Performance, add dynamic rot rate, change some loot and islands only rot on the top 2017-03-20 19:18:33 +01:00
cnr 441e2ab30f Disable 2x XP 2017-03-20 01:19:21 -05:00
Sam 95d919a654 Removed was werid disjointed code 2017-03-19 00:07:23 +00:00
Sam 05bd93cbdf Fixed Death Bomber achievement exploit 2017-03-19 00:01:11 +00:00
Sam df8ed90138 Ops, forgot to enable reports. Eclipse is bad 2017-03-18 23:44:42 +00:00
Sam b1a1faacb1 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/bridges 2017-03-17 17:03:55 +00:00
Sam 8e5a5695d5 Fix early game revive 2017-03-17 17:03:53 +00:00
samczsun db2feeac42 Reorganize tracks, add BotB track 2017-03-15 23:16:07 -05:00
cnr e5d2ad34eb Merge branch 'update/stpatrickscosmetics' into develop 2017-03-15 23:15:10 -05:00
samczsun 4778d28be4 Allow overriding enabled team armor 2017-03-15 23:13:42 -05:00
Sarah 4f9cf987bd Change block rates and add Rate command 2017-03-15 21:30:48 +01:00
Sarah 1a061f6e2f Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/skyfall
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/addons/compass/CompassAddon.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skyfall/Island.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skyfall/Skyfall.java

Rot starts at 2 minutes, Rings take 3 Minutes to rot, Top Island rots now, rings rot now
2017-03-15 17:38:07 +01:00
Sam 15d691370d Configuration for bridges 2017-03-14 21:05:52 +00:00
LCastr0 a3861d43c4 Fixes costume throwing items without complete set 2017-03-14 13:32:49 -03:00
Sam c8a9cffcdf Edit the documentation for per player world borders 2017-03-14 16:08:31 +00:00
Sam a49b19ee0c Removal of kit progression from bridges 2017-03-14 16:08:16 +00:00
Sam 1e43398875 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/bridges 2017-03-14 15:53:27 +00:00
cnr 3dc36449b5 Add 2x XP and open Gem Hunters beta
This is for spring break, and ends 3/19
2017-03-10 00:29:11 -06:00
samczsun 888761d15e Somehow missed Team Super Smash 2017-03-09 01:06:53 -06:00
samczsun b5f026d4c0 Removem misleading comment 2017-03-09 01:06:53 -06:00
samczsun a99cb6579d PC-814 2017-03-09 01:06:53 -06:00
samczsun 4be4fcb434 Fix Team Armor Addon (also PC-201) 2017-03-09 01:06:53 -06:00
AlexTheCoder a691d58840 Set up clans specific rewards for voting, daily bonus, and youtube clicks. Additionally, set up promotion for specific youtube channels in Carl. Finally, provide support for a differently-named creeper! 2017-03-09 01:04:50 -06:00
cnr 06a71946a0 Publish server status earlier during startup
Servers are allowed ten seconds to publish their status on startup by
ServerMonitor. NpcManager can consume most or all of that allotted time
on EU, so we need to initialize ServerStatusManager first.
2017-03-03 08:15:56 -06:00
samczsun b782f5ced9 Speed up generation 2017-03-01 23:58:20 -06:00
samczsun 3e8b23c6f4 Sentry Issue #223473496
Don't bother with failsafe if the game is null (i.e. beyond dead)

Steps to reproduce:
1) Quit server at just the right time
2017-03-01 23:54:02 -06:00
samczsun 3f40432268 Sentry Issue #223474603
Handle null gun in Minestrike

Steps to reproduce:
1) Bring a player down to low health using a molotov
2) Kill them with a grenade
2017-03-01 23:54:02 -06:00
samczsun 9571db123d Sentry Issue #223483175
Fix badly implement Player check in PerkBoneRush

Steps to reproduce:
1) Pick Skeletal Horse
2) Bone rush on some mob (i.e. cows in swamp)
2017-03-01 23:54:02 -06:00
samczsun cb9ac1fc9f Sentry Issue #223481030
Prevent Fish Flurry from activating if no suitable blocks are found

Steps to reproduce:
1) Select squid on hyrule castle
2) Activate fish flurry while looking at middle of empty side of castle
2017-03-01 23:54:02 -06:00
samczsun 7e9211815f Sentry Issue #223481223, #223481117
Reverse check so RHS can be null

Steps to reproduce:
1) Pick Wither Skeleton in SSM
2) Throw wither image away from other player so it has no target
3) When it's standing still (i.e no target), have the other player punch
the image
2017-03-01 23:54:02 -06:00
samczsun 0725639852 Sentry Issue #223596821
Check if player has left before performing actions

Steps to reproduce:
1) Pick wolf in SSM
2) Hit someone
3) Quit immediately after
2017-03-01 23:54:02 -06:00
samczsun 2e23d59702 Sentry Issue #223489411
Check if fired projectile is a WitherSkull before casting

Steps to reproduce:
1) Go to Wither Assult
2) Fire enderpearl
2017-03-01 23:54:02 -06:00
cnr 699845d6d7 Merge branch 'feature/gem-hunters' into develop 2017-02-25 00:40:05 -06:00
cnr 7de556e3d8 Allow plugins to choose a hub type when restarting
Clans Hubs will send to Clans Hubs, Clans will send to Clans Hubs, and
all other plugins will send to the normal Hub
2017-02-25 00:35:46 -06:00