Keir Nellyer
c82dd27b64
Make getValueOf method more robust
2016-04-28 23:36:41 +01:00
Keir Nellyer
8969ec172b
Merge branch 'feature/report' into feature/report-v2
2016-04-24 18:26:10 +01:00
Keir Nellyer
949f9ca712
Don't allow players to report themselves
...
I left this to last minute to make testing easier, as with this check
in place it means at least two players are required to test the report
mechanism.
2016-04-24 18:10:01 +01:00
Keir Nellyer
96aa5d1c4b
Removed duplicate code
...
Somehow this got duplicated and so therefore was causing compile time
errors, might have been something to do with my git merge.
2016-04-24 17:22:21 +01:00
Keir Nellyer
dab1f9485c
Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
2016-04-24 17:17:17 +01:00
Keir Nellyer
9df4dac023
Remove dead code
...
This was left over from before I took over development of the report
feature.
2016-04-24 17:16:36 +01:00
Keir Nellyer
713263214f
Run ReportPurgeTask asynchronously
...
This prevents the task from hanging the server which may be an issue
when a large amount of reports exist.
2016-04-24 17:15:12 +01:00
Keir Nellyer
57e9cd6e19
Add class headers and remove @author tags
...
This makes the PR compliant with with the Mineplex coding style.
Class headers are used to describe the function of a class and git
history will be used to determine the author of a class.
2016-04-24 17:10:29 +01:00
Keir Nellyer
84f5bd2f31
Handle abusive report types
2016-04-24 16:51:01 +01:00
Conrad
962175364b
Merge pull request #25 from Mineplex-LLC/develop
...
Release clans bugfixes.
2016-04-09 09:50:18 -04:00
Keir Nellyer
eb01cd41f1
Move display item responsibility over to ReportResultButton
...
Previously ReportResultPage handled this.
2016-04-09 00:51:05 +01:00
Keir Nellyer
51b5e50c20
Use pre-existing util method for item building
...
Removes util method added in previous commit.
2016-04-09 00:44:00 +01:00
Keir Nellyer
56b0a886bf
Add helper method for setting common item meta values
2016-04-09 00:36:04 +01:00
Keir Nellyer
8b6b3db412
Remove old pre-mavenisation files
2016-04-09 00:17:58 +01:00
Keir Nellyer
6efb8d806d
Re-enable category threshold check
...
This was disabled for testing reasons.
2016-04-09 00:02:59 +01:00
Keir Nellyer
cb434b7518
We no longer need to store IDs or notify thresholds (new system will work differently)
2016-04-09 00:00:11 +01:00
Keir Nellyer
bd7e26ef08
Fix error causing enum readable names to fail to generate correctly
2016-04-08 23:49:07 +01:00
Conrad
67adf94341
Merge pull request #23 from Mineplex-LLC/clans/beta
...
Clans/beta
2016-04-08 11:07:00 -04:00
Conrad S
8a2efa2f0b
Make sure a user has enough gold to make a purchase.
2016-04-08 10:48:55 -04:00
Keir Nellyer
95507a740c
Move button specific values from ReportCategory to ReportCategoryButton
...
This is done to separate the code out so that we can add a GLOBAL
value to the enum for handling of ABUSIVE reports (these types of
reports do not have a specific category). In its current state
it's is very closely inter-twined.
2016-04-08 00:33:29 +01:00
Keir Nellyer
c1354081ea
Implement ReportProfile
...
This class is used to hold report-specific data about a user, such as the amount of successful or failed reports the user has filed.
It also contains the total amount of abusive reports a user has filed, all this data will be used to calculate the user's reputation.
2016-04-07 22:45:15 +01:00
Ben
2c05743f62
Stop using static with Siege Manager
2016-04-07 21:01:25 +01:00
Keir Nellyer
36e79a1504
Add header to every class as per new coding standards.
2016-04-07 14:44:27 +01:00
Keir Nellyer
390b2878dc
Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-04-07 14:28:30 +01:00
Conrad
e921ccc3e5
Merge pull request #22 from Mineplex-LLC/clans/beta
...
Add missing events that are causing errors in servers, and disables incognito mode for demoted staff members
2016-04-07 08:06:40 -04:00
Ben
c484a80a14
Remove incorrect import
2016-04-07 08:12:05 +01:00
Ben
b70ff03185
Fix siege weapon crater being spawned at the lowest block at the current collision location.
...
This was causing issues when Cannons were fired at a vertical wall, and would not do any damage to the wall as it would just do damage to the blocks at the nearest ground block.
2016-04-07 08:11:37 +01:00
Ben
f2ac2d87bf
Remove debug command, that could be very abused
2016-04-07 08:07:18 +01:00
Ben
9ccec50fd0
Remove unnecessary database calls that checked for siege weapons remaining in the database, which is not possible, as siege weapons clean themselves up.
2016-04-07 08:06:16 +01:00
Ben
eed3df720a
Disable incognito mode for staff members that have been demoted whilst using it.
...
Also fixes a bug that caused IncognitoHidePlayerEvent fire even if the player logging in does not have incognito mode enabled.
2016-04-07 07:00:46 +01:00
Ben
3a8ab581dd
Add JavaDoc to new classes to comply with the new standards
2016-04-07 06:52:52 +01:00
Ben
d75d63a81a
some missing files and blacklist barrier block from block toss
2016-04-06 18:26:56 +01:00
Conrad
7209ca4522
Merge pull request #18 from Mineplex-LLC/develop
...
Update master to code running on the network.
2016-04-06 12:29:29 -04:00
Ben
d25f1abfbf
stop iron door from being opened by players not in clan (outpost)
2016-04-05 23:49:16 +01:00
Ben
738825ea9d
perms for tutoirial command
2016-04-05 23:37:08 +01:00
Ben
4bdd33c87b
blowing holes in the ground and interacting with cannon sometimes not working
2016-04-05 23:15:38 +01:00
Ben
744d8891b4
import
2016-04-05 22:58:03 +01:00
Ben
be63012d18
make trainees+ not count to kicked player count
2016-04-05 12:43:19 +01:00
Ben
876a7a8eb6
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-05 12:37:23 +01:00
Ben
cfac41f216
full server trainee+ fix
2016-04-05 12:37:04 +01:00
Jonathan Williams
dd5b2d5e3f
Fixed NPE with poison condition effect.
2016-04-05 00:36:18 -05:00
Jonathan Williams
e23362bd6f
Fixed NPE in OrderedObjective
2016-04-05 00:36:00 -05:00
Jonathan Williams
b34a175a2b
Fixed error in Outpost throwing NPE.
2016-04-05 00:35:44 -05:00
Shaun Bennett
ae87db1742
Fix TNT generator timings
2016-04-05 13:04:52 +10:00
Shaun Bennett
23232efd63
Merge remote-tracking branch 'remotes/origin/develop' into clans/beta
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
# Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java
2016-04-05 13:04:39 +10:00
Ben
7f92a3c048
incognito changes
2016-04-05 00:38:27 +01:00
Jonathan Williams
cd5ad89f51
Made clans sort by server number.
2016-04-04 17:46:51 -05:00
Jonathan Williams
53b25e6ee0
Fixed diamonds not selling in shops.
2016-04-04 17:46:35 -05:00
Jonathan Williams
6558b16004
Fixed endless loop crash bug with Gear attributes.
2016-04-04 17:46:22 -05:00
Jonathan Williams
8ea0051181
Fixed customer support menu not showing if monthly bonus hasn't been claimed.
2016-04-04 17:46:03 -05:00
