Commit Graph

9682 Commits

Author SHA1 Message Date
Keir Nellyer
48f9085c79 Small changes to report close functionality 2016-07-20 11:58:09 +01:00
Keir Nellyer
856f91da24 Update close report command syntax 2016-07-20 10:40:42 +01:00
Keir Nellyer
5c3f78b428 Fix query used to fetch report(s) account is handling 2016-07-20 10:40:03 +01:00
Sam
d53a917627 getAbilityDetails using map and list interface
Changes so it uses the interface rather than the concrete class.
2016-07-19 22:38:32 +01:00
Sam
7e26480452 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-07-19 22:29:00 +01:00
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
Keir Nellyer
80f0113183 Fix commands out of sync error by storing the result of the query 2016-07-19 17:56:27 +01:00
AlexTheCoder
0eac157701 Implement basketball features in the hub and begin setting up coordinates 2016-07-19 12:45:38 -04:00
Keir Nellyer
fccc1834a5 Rewrite view.php to work without MySQL native driver 2016-07-19 17:31:46 +01:00
Keir Nellyer
1c1825710d Merge remote-tracking branch 'origin/feature/report-v2' into feature/report-v2 2016-07-19 16:38:19 +01:00
Keir Nellyer
37a06816dd Modify /reportclose to no longer require a report id parameter 2016-07-19 16:37:53 +01:00
TadahTech
c32e647d9e Add private messaging system 2016-07-18 22:21:09 -05:00
TadahTech
ce4289fa00 Don't do weather. 2016-07-18 22:13:32 -05:00
TadahTech
c8075b2b47 Merge remote-tracking branch 'origin/feature/party-v2' into feature/party-v2 2016-07-18 19:04:26 -05:00
TadahTech
b4aa303923 Bug fixes. 2016-07-18 19:04:02 -05:00
TadahTech
36f2873e15 Map Parser update. 2016-07-18 19:00:11 -05: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
AlexTheCoder
c58d226680 More work on Nether and Runes 2016-07-18 16:26:05 -04:00
Keir Nellyer
d9240e1589 Invalid PHPDoc made me write bad code :P 2016-07-18 19:29:05 +01:00
Keir Nellyer
ca835bb4c6 Remove all try...finally clauses as they aren't supported in PHP 5.4 2016-07-18 19:08:37 +01:00
Keir Nellyer
976e8788b7 Update report message if a player reports another player multiple times 2016-07-18 18:37:21 +01:00
Keir Nellyer
103f31afc1 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-07-18 17:17:11 +01:00
Keir Nellyer
17c7f36b04 Fix getInvolvedUsers not getting reporters 2016-07-18 14:37:23 +01:00
Keir Nellyer
c89b35f2f1 Remove redundant categories array 2016-07-18 14:36:21 +01:00
AlexTheCoder
4238a1c385 Implement rune system and main nether minibosses 2016-07-17 07:14:08 -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
98e88d1b77 Disable bosses not scheduled for initial releases 2016-07-16 22:00:38 -04:00
AlexTheCoder
08850d909f Further work on brood mother boss and nether 2016-07-16 21:59:03 -04:00
LCastr0
7c300acaa3 No particles for vanished players! 2016-07-16 20:00:21 -03:00
Sam
e2af4df44b Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-07-16 21:22:57 +01:00
LCastr0
77af9fb5c2 Merge pull request #154 from Mineplex-LLC/develop
Merge develop into project cosmetics
2016-07-16 14:10:52 -03: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
Keir Nellyer
6756d04aa7 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-07-15 23:56:08 +01:00
Keir Nellyer
3a8722a1a2 Remove redundant files and variables 2016-07-15 23:54:20 +01:00
Sam
d901fce3ac Experimental Skywars Kits 2016-07-15 23:07:17 +01:00
Keir Nellyer
0d9aad37f9 Optimise imports 2016-07-15 16:31:25 +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