Commit Graph

9012 Commits

Author SHA1 Message Date
TadahTech 41b40fa12c Fix painting breaking. 2016-08-25 03:54:10 -05:00
cnr 8617572980 Fix preferences menu interaction in Clans{,Hub} 2016-08-25 02:26:42 -05:00
TadahTech 77e0090531 Tweak preferences 2016-08-25 00:17:31 -05:00
TadahTech f518185518 Tweak parkour 2016-08-24 22:55:39 -05:00
TadahTech 1654850e8c Final Changes 2016-08-24 22:26:38 -05:00
TadahTech ba2bee4f25 Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/progression/ProgressiveKit.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeDetailsButton.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeMenuButton.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitDisplayMenu.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitInformationTrackerMenu.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java
2016-08-24 21:29:01 -05:00
TadahTech bca19788db Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/progression/ProgressiveKit.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeDetailsButton.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeMenuButton.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitDisplayMenu.java
#	Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitInformationTrackerMenu.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java
2016-08-24 21:28:36 -05:00
cnr 352e1e0eb2 Merge branch 'update/skywars-finalised' into develop 2016-08-24 17:22:01 -05:00
cnr df1fc60d3d Merge branch 'update/skywars-finalised' into develop 2016-08-24 17:12:58 -05:00
Sam 4088d2a311 Air teleportation fix
Makes it less likey that a player would die of fall damage when using
the eye of ender
2016-08-24 19:50:38 +01:00
Keir Nellyer 469a72afc0 JavaDocs 2016-08-23 16:40:25 +01:00
TadahTech c9d14dc522 Update clans to new preferences. Remove debug messages. 2016-08-23 03:12:36 -05:00
TadahTech bbe44e7d75 Remove debug. 2016-08-23 02:04:07 -05:00
TadahTech 02f703e68e Remove debug. 2016-08-23 01:57:39 -05:00
TadahTech 42c228773c Fix entity directions 2016-08-23 01:52:19 -05:00
TadahTech 3b9d6adfbc Lobby Update 2016-08-23 01:37:07 -05:00
Sam 2c37d17db3 Slight code change 2016-08-22 19:42:30 +01:00
Sam e0f319ea09 Change kit internal names
Changes the kit internal names to match the current skywars ones in
order so that kit progression experience is carried over during this
update.
2016-08-22 17:28:51 +01:00
Keir Nellyer dcfeaab5e1 Show invalid usage with alias used 2016-08-22 16:48:59 +01:00
Keir Nellyer fb369d3df9 Add command to unban player from report system 2016-08-22 16:36:42 +01:00
Keir Nellyer f805ceccdc Don't include aborted reports in report statistics 2016-08-22 16:07:14 +01:00
xGamingDudex 7fb6ff58d0 Moved gadgets to use a whitelist system instead of blacklist for
collisions
2016-08-22 01:00:29 +02:00
Sam 7db41a8be5 Reduce Earth kit scaling 2016-08-20 22:45:17 +01:00
Sam 28bbda23f5 Remove debug commands 2016-08-20 22:44:54 +01:00
Sam e6530a6f44 More tweaks and fixes 2016-08-20 12:14:01 +01:00
xGamingDudex e64324b36c Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698 2016-08-20 11:40:15 +02:00
Keir Nellyer bde51e6a54 The server of the handler now handles sending periodic message, instead of it being done through Redis
This also fixes server restarts breaking handler messages.
2016-08-19 18:08:36 +01:00
Sam dc5c2430cd Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-08-19 17:58:27 +01:00
Keir Nellyer d05a69ac69 Fix handler message disappearing when changing server 2016-08-19 17:27:05 +01:00
Keir Nellyer 6367321315 Fix weird colouring 2016-08-19 17:26:08 +01:00
Keir Nellyer eabaa1e68a Move limit statistic limit to query and sort returned results 2016-08-19 17:01:26 +01:00
Keir Nellyer 834e6b5fdf Switch to using UtilPlayer.message 2016-08-19 16:48:05 +01:00
Keir Nellyer 26aff936a0 Rename /reportstat command to /reportstats 2016-08-19 16:46:49 +01:00
Keir Nellyer 779efe3f47 Improve display of /reportstat 2016-08-19 16:46:25 +01:00
Keir Nellyer bbb40a7b6e A report is considered expired once it's priority is < 1 2016-08-19 16:23:19 +01:00
Keir Nellyer b6f0e84a02 Fix sql error when attempting to reinsert same report mapping 2016-08-19 16:21:44 +01:00
Keir Nellyer 2a62abfd33 Push chat snapshots at save time instead of handle time 2016-08-19 16:07:06 +01:00
Keir Nellyer a1a604757b Remove old todo 2016-08-19 15:48:02 +01:00
Keir Nellyer 5b685a3a86 Fixed query for getting unhandled reports to behave well with abused reports 2016-08-19 15:46:59 +01:00
Keir Nellyer 2211e6c4ef Fix query for getting reports a user is handling to ignore aborted reports 2016-08-19 15:03:54 +01:00
Keir Nellyer 514757924d More descriptive message when aborting a report 2016-08-19 14:31:15 +01:00
Keir Nellyer 373c82c11b Fix query for getting unhandled reports 2016-08-19 14:30:59 +01:00
Keir Nellyer ee78cf2bb9 Cancel messaging task if handler is no longer present 2016-08-19 14:30:24 +01:00
Keir Nellyer 10a6cbfe3b Remove handler from report object when aborting a report 2016-08-19 14:29:15 +01:00
Keir Nellyer 24d4da6aa2 Fix query to fetch report not fetching reports with no handler 2016-08-19 14:19:52 +01:00
Keir Nellyer e6609d59c9 Fix incorrect MySQL operator 2016-08-19 14:01:17 +01:00
Sam c4cb5d8db4 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-08-19 12:56:24 +01:00
cnr 5365f1269f Delay Anticheat enable in Clans
This ensure the anticheat has registered GameStartEvent before we fire
it
2016-08-18 20:46:24 -05:00
cnr 72ddfd5d85 Disable server spawn radius in Clans
Defer to the spawn claim area, instead
2016-08-18 20:44:01 -05:00
LCastr0 84c6720d1c Fix merging errors 2016-08-18 18:30:32 -03:00
LCastr0 f4175ed724 Added PowerPlay managers, commands, button inside Carl to claim PowerPlay bonus... Includes a new SQL table, will be sent to Connor and Jaws so they can release it correctly! :D 2016-08-18 18:07:32 -03:00
Sam 3b11a2e985 Killstreaks 2016-08-18 22:02:33 +01:00
Keir Nellyer b4ae149d89 Handlers can now abort a report allowing it to be handled by another
member of staff
2016-08-18 14:42:53 +01:00
cnr a79fa9cd46 Update GWEN preference name to reflect its purpose 2016-08-18 01:59:31 -05:00
cnr 08e1b765f7 Send local Anticheat messages regardless of preference 2016-08-18 01:59:31 -05:00
cnr 78fe41a8af Update Anticheat ban message and duration 2016-08-18 01:59:30 -05:00
cnr 999237fe69 Accurately report game TPS 2016-08-18 01:59:05 -05:00
cnr 405f67f8b2 Implement/activate Anticheat phase two
- Remove anticheat guardians from Arcade
- Uncomment/implement Anticheat phase two actions
  - Specifically: immediate ban on Kill Aura type A, VL 200.
- Give moderators less-specific messages, and limit messages by severity
2016-08-17 23:23:20 -04:00
AlexTheCoder c66e485c9e Fix arrow knockback 2016-08-17 23:22:30 -04:00
Sam 6c1bd88631 Increase passive knockback 2016-08-17 23:33:31 +01:00
Sam 1565b66395 Ore level changes 2016-08-17 23:33:17 +01:00
Sam 8d6e4a5fd3 Remove some unused code and cleanup 2016-08-17 22:28:22 +01:00
xGamingDudex 69275cb79c Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698 2016-08-17 20:57:18 +02:00
Keir Nellyer 3126d540e7 /reportstat command progress 2016-08-16 21:30:37 +01:00
Sam 0176f31f1e Complete implementation of kit progression 2016-08-16 18:55:26 +01:00
Keir Nellyer 3760166599 Remove remnants of old user report preference 2016-08-16 14:13:01 +01:00
Sam 604f5bc2cc Update to work with new scoreboard system 2016-08-16 11:03:12 +01:00
Sam 29a07c60ab Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-08-16 11:02:15 +01:00
Sam 84e5b38380 Testing session feedback 2016-08-16 10:53:37 +01:00
Sam dac4d9595c Change scoreboard to use new system 2016-08-15 20:28:12 +01:00
Sam 6839006bd1 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-08-15 20:25:01 +01:00
Sam d5d8f07085 Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple 2016-08-15 19:21:56 +01:00
Sam df606d5e07 Changed game logic to try out multiple round concept 2016-08-15 19:19:20 +01:00
Sam 09741d4d2a Added VersionModule (The new way to check client versions for games) 2016-08-15 19:18:51 +01:00
Sam ea7d877d36 Some attempt at per player kits 2016-08-15 17:45:24 +01:00
cnr 08e65cb17e Implement MineplexLink spectator check 2016-08-14 17:40:28 -04:00
xGamingDudex 6e32906805 More Gadget Collision patches 2016-08-14 22:50:48 +02:00
xGamingDudex 045445791a Fixed gadget collision checks 2016-08-14 21:06:28 +02:00
xGamingDudex e71cec874e Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698 2016-08-14 20:09:01 +02:00
Sam 8f4303cf39 Progress on Upgrade Details 2016-08-13 22:40:33 +01:00
Shaun Bennett 0f4f1a3582 Remove pointless try/catch 2016-08-13 01:39:56 -05:00
Shaun Bennett c99a23d670 Add region and server to chat payload 2016-08-13 00:57:39 -05:00
Sam 33cb4db338 Minestrike - Stop vanished players being assigned teams on join 2016-08-12 19:52:23 +01:00
Sam 2915a5e3b9 Add mid-game kit changing NPCs 2016-08-11 21:16:49 +01:00
Sam 69fd78bbf2 Remove Shurikens 2016-08-11 19:05:13 +01:00
Shaun Bennett a744566cd3 Add AntiSpam front end 2016-08-11 11:34:17 -05:00
Keir Nellyer a8e891f247 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
2016-08-11 14:53:57 +01:00
Sam 60a46c8c10 Fire burst is now instant 2016-08-11 14:26:25 +01:00
Keir Nellyer 5b516fd7bd Show player name in black if not suspect 2016-08-11 11:37:09 +01:00
Keir Nellyer 09b458af68 Mega-hack to remove unwanted whitespace (allowing the page to render
correctly)
2016-08-11 11:37:09 +01:00
Keir Nellyer ebea70d078 Remove echo port debug line 2016-08-11 11:35:13 +01:00
Keir Nellyer 735eccca37 Move font styling over to stylesheet 2016-08-11 11:35:13 +01:00
cnr 4562b00dcb Repurpose MAC reports pref for GWEN reports 2016-08-11 04:01:14 -04:00
cnr 7b1ac5ded2 Merge branch 'update/clans' into develop 2016-08-10 21:27:43 -04:00
samczsun 7de9da3d1c Complete rework of disguising and antihack hook
This commit completely rewrites DisguiseManager, DisguisePlayer, and
PlayerDisguiseManager.

Changes to disguising means that much of the core was also changed,
primarily having to do with mapping by UUID versus player names.

Several new API classes were added, such as EntitySelector, Managers,
UtilTasks, and a brand new scoreboard API which is much more optimized and
allows for much longer lines

The new anticheat is hooked as well, with implementation for guardians
which follow the players around. Release two code is also included, but is
currently disabled via a boolean.
2016-08-10 21:03:30 -04:00
Sam 82b2541e34 PC-827
Team SSM - Teammates can no longer cancel each other's Blaze Firefly
2016-08-10 21:47:13 +01:00
Sam df646b0659 PC-897
SG - Spectators can no longer punch fireballs from the world border
2016-08-10 21:46:37 +01:00
Sam a02699d84a PC-898
SSM - Fixes an issue where kit armor would not appear correctly in your
inventory.
2016-08-10 21:46:02 +01:00
Sam 933861176d PC-662
Castle Siege - Fixes the game not ending if the whole of one team left.
2016-08-10 21:45:27 +01:00
Sam e05f90372a Add kit upgrade details 2016-08-10 19:05:40 +01:00
Keir Nellyer ff7a427787 Handle party chat correctly 2016-08-10 16:57:44 +01:00
Keir Nellyer cbdce80483 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-08-10 16:01:47 +01:00
xGamingDudex 907ac7473f Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698 2016-08-10 16:52:37 +02:00
Keir Nellyer e43c241338 Display suspect username in red in chat log 2016-08-10 15:30:17 +01:00
Sam 87dd4c5632 Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple 2016-08-09 20:23:58 +01:00
Sam c19825cbb0 Remove unused imports 2016-08-09 20:23:50 +01:00
Alexander Meech 5fca64b86b Remove safezone requirement for observer mode 2016-08-09 15:10:45 -04:00
Keir Nellyer 84d7838e13 Allow setting of alternative MySQL port 2016-08-09 15:37:45 +01:00
Keir Nellyer bc1265a828 Remove custom font on player ranks to match rest of site 2016-08-09 15:23:15 +01:00
Keir Nellyer d627c6e98e Improve css styling slightly 2016-08-09 15:20:49 +01:00
Keir Nellyer 31800ee1e7 Colour suspect messages 2016-08-09 15:17:19 +01:00
Sam 950a46ad12 Fix Throwable Dirt's velocity 2016-08-09 14:06:39 +01:00
Sam 5fd5245978 Use attack name 2016-08-09 13:07:17 +01:00
Sam 95c23585c8 Missed a file 2016-08-09 12:53:54 +01:00
Sam acd5e0c1d2 Added minecart colors 2016-08-09 12:53:34 +01:00
AlexTheCoder e5a96e8189 Fix incorrect casing in mapping outposts 2016-08-08 21:54:27 -04:00
Sam 2f3ff052ff Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-08-08 22:59:55 +01:00
Sam 4c825cf80b Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-08-08 22:48:33 +01:00
Sam 3bab7ffe44 Use attack name for Snowballs and Eggs 2016-08-08 22:48:13 +01:00
Sam 239761962d Now 1.9! 2016-08-08 20:49:24 +01:00
Keir Nellyer 6294e66484 Show report category on report site 2016-08-08 16:51:40 +01:00
Sam 93e49bc8a6 Stop placing and dropping of skill items 2016-08-08 16:44:13 +01:00
cnr 4180f03a52 Use the correct SalesPackageBase for gadgets 2016-08-07 22:40:26 -04:00
AlexTheCoder 5a2871528f Small aesthetic change to ghasts 2016-08-07 18:53:35 -04:00
AlexTheCoder 73cb42c7ab Make outposts actually end after they expire 2016-08-07 18:53:23 -04:00
AlexTheCoder cce871b0e2 Stop runes being applied to stacks of items 2016-08-07 18:53:05 -04:00
AlexTheCoder 4e8ed68efd Stop bows from selling in stacks 2016-08-07 18:52:48 -04:00
AlexTheCoder 36e6c7ce33 Fix slight error in amplifier end messages 2016-08-07 18:52:21 -04:00
AlexTheCoder e16d88e52b Add 'Safe' items replacing normal trapped chests and make craters not spam message when they explode 2016-08-07 18:52:00 -04:00
AlexTheCoder 5985731909 Make block drop rate 30% like normal TNT 2016-08-07 17:55:38 -04:00
AlexTheCoder 36aa1f9317 Stop swords and bows from being sold in stacks 2016-08-07 15:02:23 -04:00
AlexTheCoder 95302177f8 Add cooldowns to all gui items tied to giving rewards to prevent some exploitation 2016-08-07 14:47:14 -04:00
Sam 280ff577fa Metal Kit skill item placing and dropping 2016-08-07 01:25:48 +01:00
Sam 44274bcc64 Projectiles, Enchanted armor & StackOverFlows
Fixes an issue where players with enchanted armor would cause the server
to frezze for an extended amount of time due to a stackoverflow error
when hit by projectiles such as snowballs or eggs.
2016-08-07 01:23:03 +01:00
Sam 4173c96d32 Fixes inconsistency with the scoreboard 2016-08-06 23:56:54 +01:00
AlexTheCoder c5d979e5dc Remove unnecessary while loop 2016-08-06 03:08:29 -04:00
AlexTheCoder 8eb74de2e8 Make outposts not try to block all right clicking everywhere -.- 2016-08-05 21:34:31 -04:00
Sam 691fc309c4 Documentation 2016-08-05 22:11:25 +01:00
Sam e6bdfe8ba7 Per player fireworks 2016-08-05 22:11:15 +01:00
AlexTheCoder 4e0971ab0a Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-08-05 14:35:57 -04:00
AlexTheCoder 5b03692c97 Add in cooldowns for other clans shop buttons to stop autoclick exploits 2016-08-05 14:33:59 -04:00
AlexTheCoder 599c47a8c2 Prevent stacks of runes being consumed on one item 2016-08-05 14:33:21 -04:00
AlexTheCoder a56f72b6af Unify standard for event spawn points 2016-08-05 14:32:30 -04:00
AlexTheCoder 4637bc8531 Prevent war times from displaying as negative 2016-08-05 14:31:13 -04:00
AlexTheCoder 223fb0e526 Use custom explosion calculations as opposed to default mineplex explosion handling 2016-08-05 14:30:00 -04:00
AlexTheCoder d73ced0e87 Stop portals from spawning in mid-air 2016-08-05 14:28:49 -04:00
AlexTheCoder 6170f9df87 Actually enable create button by removing stray '!' 2016-08-05 14:27:07 -04:00
AlexTheCoder 027b6b3fc4 Prevent players from using /c home after recently being in combat 2016-08-05 14:25:47 -04:00
AlexTheCoder ce6a0b376c Prevent players using the gui to bypass join cooldowns 2016-08-05 14:24:56 -04:00
AlexTheCoder e01b57ceac Implement auto restart system for clans servers in off-peak times 2016-08-05 14:24:00 -04:00
AlexTheCoder ee1f2a7ef9 Make trapped chests more resistant to being opened and allow all chest types to be opened by besiegers, as well as preventing recruits from using hoppers to get items out of chests (PC-611) 2016-08-05 14:22:17 -04:00
AlexTheCoder 1ab5c8229b Make bosses clean up after themselves and be more error-resistant 2016-08-05 13:40:05 -04:00
AlexTheCoder 14f140143b Re-enable music in hub gadgets 2016-08-05 13:34:33 -04:00
AlexTheCoder bf7065732b Fix jukeboxes not being removed from the world from cosmetics and scoreboards attempting to use data from indices they do not have 2016-08-05 13:34:04 -04:00
Keir Nellyer 1854b71757 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2016-08-05 17:05:01 +01:00
Sam 2c6fc85fee Logic fix and message change 2016-08-04 17:59:28 +01:00
cnr 0ca4fe2d38 Disable MAC kick for suspicious movement 2016-08-04 12:41:59 -04:00
Sam 618a132806 Payload path marker logic change 2016-08-04 17:29:40 +01:00
Sam 24c1e5fc3b Kit items are now unbreakable 2016-08-04 17:29:01 +01:00
Sam 23b7064d43 Island ores bug 2016-08-04 16:56:13 +01:00
Sam 190ced7d97 Metal Kit tweaks 2016-08-04 16:55:52 +01:00
xXVevzZXx 91cf391724 some adjustments to UHC Survivalgames 2016-08-04 00:33:24 -04:00
cnr 3610f78b37 Merge branch 'feature/thanks' into develop 2016-08-03 22:23:46 -04:00
Shaun Bennett 85c4c181ec Reload ThankData when a player is /thank - Allows rewards to appear immediately at carl 2016-08-03 18:22:36 -05:00
Shaun Bennett e113bedea5 Fix accidentally refactoring "thanks" in strings 2016-08-03 15:11:31 -05:00
Shaun Bennett 72f078fe54 Fix using wrong name, add missing jooq files 2016-08-03 15:04:06 -05:00
Shaun Bennett 6d93efc1a2 Adjust button text as well 2016-08-03 14:57:30 -05:00
Shaun Bennett ad6c1dd970 Adjust some text wording 2016-08-03 14:55:33 -05:00
Shaun Bennett 2e80838376 Update ClaimTips lore 2016-08-03 14:25:07 -05:00
Shaun Bennett a61906acfa Ignore "Testing" boostergroup when announcing activation 2016-08-03 14:24:49 -05:00
Shaun Bennett ca13b8f29e Fix compile errors 2016-08-03 14:18:26 -05:00
Shaun Bennett 1ae7f6cb25 Integrate the new ThankManager into Amplifiers 2016-08-03 14:03:12 -05:00
cnr 3f0938815d Merge branch 'update/clans' into develop 2016-08-03 12:39:52 -04:00
AlexTheCoder fb3cfecc79 Move recharge handler 2016-08-02 20:44:09 -04:00
Sam 2b8754aa32 Metal Kit bug fixes 2016-08-02 23:34:12 +01:00
Keir Nellyer c327309a65 Switch over to new method of determining if user is banned, this will allow unbanning of players in the near future 2016-08-02 16:46:14 +01:00
Shaun Bennett f41cd8c104 Add /thank command. Update jooq files 2016-08-02 00:10:46 -05:00
md_5 dad453bd84 Remove Sentry - Unused 2016-08-02 11:42:16 +10:00
Sam 62a1968b01 Experimental Metal Kit 2016-08-02 01:13:16 +01:00
AlexTheCoder 4fdbb1fc9d Fix assorted bugs 2016-08-01 14:48:44 -04:00
Sam bd00ac8446 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-08-01 19:34:40 +01:00
Sam 2c37af32ca Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-08-01 19:19:34 +01:00
Sam 4085453f0f Ninja Dash stopping/not working on rails 2016-08-01 18:47:17 +01:00
Sam 71f9fd97d6 End Effect change
Reduced the amount of TNT thrown and reduced the velocity at which they
are fired.
2016-08-01 18:46:35 +01:00
Sam 8f96b15454 Ninja Dash damage radius fix 2016-08-01 17:18:01 +01:00
Sam 84a4aa5157 Reduce Shuriken damage 2016-07-31 13:47:28 +01:00
Sam 1fde433c50 More changes and fixes 2016-07-30 22:53:36 +01:00
AlexTheCoder cd237b8d3b Make players teleport to shops once they return to the nether 2016-07-30 17:42:57 -04:00
AlexTheCoder d12d353c20 Fix pronoun in message autoreply 2016-07-30 17:36:03 -04:00
AlexTheCoder 2d39dbfb58 Move clans admin text 2016-07-30 17:34:03 -04:00
AlexTheCoder fe92633802 Add claim limit override for admin claiming 2016-07-30 16:49:39 -04:00
AlexTheCoder d1d366dcf8 Add a cooldown to clans shops to reduce chance of edge-case negative gold balances 2016-07-30 09:46:02 -04:00
AlexTheCoder 9e2ba8c653 Fix fissure applying to anvils 2016-07-30 09:36:38 -04:00
Sam 063e05c0f3 Move subtle changes and fixes 2016-07-29 19:07:24 +01:00
AlexTheCoder ecb56bf450 Fix players being able to use de-blink to teleport between worlds 2016-07-29 13:35:09 -04:00
Keir Nellyer 635e07c5a2 This wasn't meant to be included in the last commit 2016-07-29 15:09:21 +01:00
Keir Nellyer bb9dbf1da4 PC-877 Vanish report handler when teleporting to offender's server 2016-07-29 15:08:03 +01:00
Keir Nellyer 806ec2460a Add Gameplay report category for gameplay related reports 2016-07-29 13:20:06 +01:00
Keir Nellyer 43c94e95b3 PC-875 Players should only be banned after 3 abusive reports (currently is set to 1) 2016-07-29 12:58:08 +01:00
Keir Nellyer 9c76fec54e PC-874 Show label for report closure reason when closing a report 2016-07-29 12:56:14 +01:00
AlexTheCoder 96e0625548 Fix mislabeling of shop item in user display 2016-07-29 03:15:22 -04:00
cnr d853f8467c Merge branch 'update/clans' into develop 2016-07-28 22:56:23 -05:00
TadahTech 9529789159 Remove 3 second chat delay. 2016-07-28 22:54:04 -05:00
AlexTheCoder 62e0a39ee8 Fix some medium graphics issues 2016-07-28 23:28:47 -04:00
cnr 8d0dc0ce08 Merge branch 'feature/party-v2' into develop 2016-07-28 21:19:52 -05:00
AlexTheCoder f53503f16a Move code in sync runnable 2016-07-28 21:07:29 -04:00
AlexTheCoder dddfb4420c Fix players being allowed to recall through worlds 2016-07-28 21:05:25 -04:00
AlexTheCoder 841a44b8a6 Make clan create button functional 2016-07-28 21:02:04 -04:00
AlexTheCoder 16804a860c Made duping usage for class shop impossible 2016-07-28 20:22:30 -04:00
AlexTheCoder 97d5d21a55 Fix lightning orb duping 2016-07-28 19:43:43 -04:00
AlexTheCoder 853fe31fbe Merge branch 'update/clans' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-07-28 19:11:39 -04:00
AlexTheCoder 3aad06cc8a Make Clans displayed as FULL instead of BETA in server compass 2016-07-28 19:11:14 -04:00
AlexTheCoder 47d79bbad5 Fix bugs arising during clans release 2016-07-28 19:08:47 -04:00
AlexTheCoder f3944527f8 Display clans purchases properly in support server 2016-07-28 19:08:24 -04:00
LCastr0 ab8d6daa2c GitHub being annoying again 2016-07-28 19:59:49 -03:00
Sam 9b71f8c30b Typo in KitBarrage 2016-07-28 22:49:58 +01:00
Sam 6c11037460 First QA testing session feedback 2016-07-28 22:39:05 +01:00
LCastr0 ab52965e44 Power Play button inside Carl, and the power play manager 2016-07-28 18:07:10 -03:00
Sam 771f643b42 Jumping disabled during Pyromancer ULT 2016-07-28 21:01:29 +01:00
cnr a498bc13db Reinstate async wrappers for clans gold access 2016-07-28 14:59:43 -05:00
Sam 446aec5187 Add "for Team X" when picking up the Arrow powerup 2016-07-28 20:19:50 +01:00
Sam ba03051689 Add 1 second respawn delay 2016-07-28 19:33:16 +01:00
Sam d30703c570 Completed game logic & Kit fixes 2016-07-28 19:31:15 +01:00
Shaun Bennett 9c42f4c147 Use the proper boostergroup for amplifier thanks 2016-07-28 13:27:48 -05:00
Keir Nellyer 5dd35d45c4 PC-873 Alert user regardless of usage if banned from using /report 2016-07-28 17:41:20 +01:00
Keir Nellyer 8ee6ab6a1b Display message to reporters of a report when it is closed 2016-07-28 17:17:12 +01:00
AlexTheCoder f0be7794f5 Lower skeleton king passive rate 2016-07-28 06:16:20 -04:00
AlexTheCoder 4efe1fe76d Make boss portals open where the boss spawned 2016-07-28 05:46:26 -04:00
AlexTheCoder c30d30b2e7 Fixes event mobs getting stuck outside 2016-07-28 05:33:37 -04:00
TadahTech ab9bf2f405 Fixes possible bug with party leaders not seeing chat.
Adds pling when you received an invite.
2016-07-28 03:40:24 -05:00
AlexTheCoder 639e089901 Disable clans tutorial 2016-07-28 04:28:34 -04:00
AlexTheCoder aef94e13a8 Fix message not being sent 2016-07-28 04:18:29 -04:00
AlexTheCoder b718a72366 Fix shop chunk size being too small for map 2016-07-28 02:59:03 -04:00
cnr dd38a1dd76 Merge branch 'update/clans' into develop 2016-07-27 20:40:35 -05:00
AlexTheCoder d5a1312c48 Update border size to match new map 2016-07-27 20:46:40 -04:00
cnr 05e59ae9cc Revert "Revert "Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing""
This reverts commit 917b83250d.
2016-07-27 19:03:04 -05:00
Sam 00c0e38b82 Kit upgrades now display 2016-07-27 23:02:40 +01:00
xXVevzZXx 749fa36a5a remove debug and check for Integer class 2016-07-27 16:47:08 -05:00
cnr 646ce96250 Ensure gold balance row is present 2016-07-27 16:15:03 -05:00
AlexTheCoder 62871686b0 Update clans store items to currency changes 2016-07-27 16:57:07 -04:00
cnr dfbebe11f4 Use separate gold balances for each clans server 2016-07-27 15:52:07 -05:00
AlexTheCoder 031a9575ae Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-07-27 15:13:18 -04:00
AlexTheCoder 6180bea5cc Update clans drop aesthetics and spawn/shop locations 2016-07-27 15:07:11 -04:00
xXVevzZXx 43c45f4094 add timer to dragon escape 2016-07-27 13:59:35 -05:00
Sam 8648581140 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-07-27 19:57:25 +01:00
Sam ee38cb4c39 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-07-27 19:56:36 +01:00
Sam 888d3fb1aa Payload logic progress 2016-07-27 19:56:31 +01:00
cnr 167c0f2b5e Reimplement EnergyShopButton with new machinery 2016-07-27 13:52:03 -05:00
cnr 3cddf35d12 Refactor out legacy ConfirmationPage 2016-07-27 13:52:03 -05:00
cnr 3d0cc2a5fd Refactor Clans gold dependency out of core 2016-07-27 13:52:03 -05:00
cnr dc96258055 Merge branch 'feature/party-v2' into develop 2016-07-27 13:19:25 -05:00
Shaun Bennett 0d46bc4609 Add Amplifier thank button 2016-07-27 13:17:36 -05:00
Keir Nellyer 4dbbe6c32a Allow Collector instance to be configured in parameters 2016-07-27 16:49:50 +01:00
Keir Nellyer 97d72e97e4 Variable refactorings for consistency 2016-07-27 16:09:38 +01:00
Keir Nellyer f2435c3b43 Packet class refactorings 2016-07-27 16:08:23 +01:00
Keir Nellyer 20fc867578 Display rank 'ALL' as 'Player' 2016-07-27 15:52:22 +01:00
Keir Nellyer d474139220 Don't show Punish GUI unless report result is ACCEPTED 2016-07-27 15:46:54 +01:00
Keir Nellyer 63917297ef Show /report and /reportclose command usage when attempting to use the command incorrectly 2016-07-27 15:45:12 +01:00
xGamingDudex 72b5507390 Fixed PC-120 2016-07-27 12:29:07 +02:00
xGamingDudex 161381f393 Fixed PC-698 2016-07-27 12:09:59 +02:00
AlexTheCoder 157c969e8d Completely prevent players in parties from joining Clans servers 2016-07-27 05:51:49 -04:00
AlexTheCoder d162750aec Keep nether loaded if its not empty 2016-07-27 04:47:03 -04:00
AlexTheCoder ea3cb36d3a Clean up miniboss mobs after their chunk unloads 2016-07-27 04:43:00 -04:00
AlexTheCoder 85cf005eba Small clans economy changes 2016-07-26 22:33:19 -04:00
AlexTheCoder 9c700425fd More javadocs 2016-07-26 22:32:46 -04:00
Keir Nellyer 2a167745a6 Update chatsnap url 2016-07-26 16:51:59 +01:00
AlexTheCoder d98ca0ab3c Remove unused miniboss 2016-07-26 09:00:37 -04:00
AlexTheCoder bb5d766ba6 Patch war point evasion by committing suicide in safezones 2016-07-26 07:35:11 -04:00
AlexTheCoder 34d5fb5e24 Fix craters getting glitched in wilderness 2016-07-26 07:15:40 -04:00
AlexTheCoder e396acc69c Fix clans ips being added to the bungee rotator 2016-07-26 07:15:09 -04:00
AlexTheCoder 4df8de58a6 More javadocs 2016-07-26 05:51:42 -04:00
AlexTheCoder bf5e9f1d76 ADD JAVADOCS TO CLANS 2016-07-26 05:50:43 -04:00
AlexTheCoder 61eca3ced0 Removed auto disguising from clans hub and removed clans tnt protection 2016-07-26 00:54:31 -04:00
AlexTheCoder 7b358adba1 Prevent runed pickaxe from destroying the nether 2016-07-25 20:26:23 -04:00
AlexTheCoder b41ad2e087 Fix NPC orientation in clans hub 2016-07-25 12:28:25 -04:00
AlexTheCoder aecaa89443 Update clans hub spawn location 2016-07-25 12:08:37 -04:00
AlexTheCoder 9a73784b7c Make clans in the hub route through clans hubs 2016-07-25 11:18:10 -04:00
AlexTheCoder a1fd021f8d Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-07-25 10:59:38 -04:00
AlexTheCoder 6f0d21120e Serious tweaks to gameplay and begin documentation 2016-07-25 10:59:03 -04:00
AlexTheCoder 0ecdce4edc Add clans hub to maven 2016-07-25 10:58:32 -04:00
AlexTheCoder 979bb92034 Allow treasure chests to be placed in other locations instead of fixing them in the main hub's configuration 2016-07-25 10:57:15 -04:00
AlexTheCoder 25b0ae5916 Add support for sending players back to any clans hub via portal 2016-07-25 10:56:30 -04:00
AlexTheCoder 275ab52f79 Create a clans-only hub 2016-07-25 10:55:18 -04:00
AlexTheCoder 9fab8366b7 Add support for clans hub connection inside bungees 2016-07-25 10:52:48 -04:00
TadahTech 5180e46be7 Revert party chat symbol to "@". Change team chat symbol to "#". 2016-07-24 22:17:50 -05:00
Sam 80eb7b2fd3 Gives Super Arrow on start. 2016-07-24 22:44:50 +01:00
Sam 576b92a5ce Ultimates added to QuiverPayload 2016-07-24 22:06:14 +01:00
TadahTech a23c2c4e1c Update UI to reflect allowing upgrades to be shown, per kit. 2016-07-24 16:05:19 -05:00
Sam ef797aa599 Velocity fix 2016-07-24 21:41:42 +01:00
Sam 76da92f42e QuiverPayload added
Basic implementation added
2016-07-24 21:27:31 +01:00
LCastr0 f4c40c61bb Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-07-24 13:18:53 -03:00
LCastr0 195a82f78f Github is annoying me about this, but I don't know what it is 2016-07-24 13:18:33 -03:00
LCastr0 0dce530438 PowerPlayClub managers and stuff 2016-07-24 13:15:32 -03:00
Sam a8503d2fb8 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-07-24 11:50:48 +01:00
Sam 4728a50ca9 Small message change
Avoids using two variables
2016-07-24 11:49:57 +01:00
TadahTech ceccf2d2ac Don't give the item when a game is in progress. 2016-07-23 22:36:53 -05:00
TadahTech 133376fb94 Relocation of Full server check in party invites. Fixes a bug where people cannot invite players to their party, regardless of which server they are on, when the inivters server is full. 2016-07-23 19:50:57 -05:00
Sam 50de769e36 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-07-24 00:13:13 +01:00
Sam 03b3c1864d Map crumble issue
Fixes an issue where the max distance of a map would not be calculated
correctly affecting the map crumble
2016-07-24 00:12:48 +01:00
Sam d3c9957f95 Ultimate length tweaks 2016-07-23 23:43:06 +01:00