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

9387 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
LCastr0
f58266f276 Merge pull request #181 from Mineplex-LLC/develop 
Merges from develop
 2016-08-18 18:02:28 -03:00