807b12e846
Fix TnT datawatcher
2016-04-25 10:38:01 +10:00
d8f7301e69
Update to latest Spigot
2016-04-25 10:29:17 +10:00
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
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
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
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
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
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
491c509317
Added UnlockCosmetics command (/unlockCosmetics <type>)
...
Added Ammo command (/ammo <gadget> <ammo> [player])
Added util for red world border screen (UtilPlayer.sendRedScreen)
Added new costume -> Wind Up
Removed test gadget (ItemBouncyBall)
2016-04-23 22:16:02 -03:00
b21939444c
Some changes to error handlng for clans regions
2016-04-23 16:40:39 +10:00
c7970d1bd0
Prevent super paintball spectators from reviving teammates. Fixes PC-103
2016-04-22 19:48:03 -05:00
ccd630e2ae
Leftovers from merge
2016-04-23 00:56:19 +02:00
b7099088a9
Merge remote-tracking branch 'origin/develop' into project-cosmetics
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/block/schematic/Schematic.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguisePlayer.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/data/TNTGenerator.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/MiscManager.java
2016-04-23 00:55:48 +02:00
fe0cee65e8
Added gem and coin rewards back into bonus.
2016-04-22 05:33:25 -05:00
260c617007
Merge remote-tracking branch 'remotes/origin/alex-mcl' into develop
2016-04-22 05:12:30 -05:00
2f94b8cebc
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla
2016-04-22 06:04:33 -04:00
e28621ae26
Set oldElo equal to new elo on new row.
2016-04-22 05:04:13 -05:00
2a4c3209b4
- Enable ELO
2016-04-22 05:44:56 -04:00
70541fd6f2
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla
2016-04-22 05:41:24 -04:00
d73b720323
Merge branch 'features/elo' into develop
2016-04-22 04:34:35 -05:00
477acf044e
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
2016-04-22 04:34:21 -05:00
6db7e648f5
Don't insert new row if the update doesn't succeed because of elo mismatch on loss.
2016-04-22 04:20:59 -05:00
7b18efa7b0
Prevent farming elo up with multiple games by dc and joining new game.
2016-04-22 04:05:07 -05:00
ddd1c5af9b
Removed EloSettings and fixed scoreboard.
2016-04-22 03:10:09 -05:00
34f94c0381
Reverted scoreboard because of MC maxlines turd nugget.
2016-04-22 02:55:27 -05:00
a31eccc15b
Multiply new rating by team size. MIssed that undo!
2016-04-22 02:53:02 -05:00
4577cf0398
Fixed scoreboard :D
2016-04-22 02:47:48 -05:00
7cc4811ede
Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into features/elo
2016-04-22 02:39:35 -05:00
f922be51fe
Scoreboard tweak.
2016-04-22 02:39:08 -05:00
04fe30df43
- Fix sb
2016-04-22 03:38:20 -04:00
5e255fc4ed
Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix
2016-04-22 03:36:21 -04:00
757c945320
Added in kFactor ratio application to rating delta.
2016-04-22 02:35:37 -05:00
03bdc8d2db
Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix
2016-04-22 03:17:54 -04:00
b69a75355c
Fixed scoreboard alignment.
2016-04-22 02:17:40 -05:00
aa6d25139f
Tweaked elo for team games.
2016-04-22 02:04:57 -05:00
b1c05e2ed0
Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix
2016-04-22 02:12:02 -04:00
776093288a
Fixed rating not setting in EloPlayer constructor.
2016-04-22 01:11:48 -05:00
2d2c8858e6
Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix
2016-04-22 02:06:55 -04:00
1d3ad3c5fd
- Enabled ELO for testing
2016-04-22 02:06:37 -04:00
977fbe684a
Fixed elo query.
2016-04-22 01:06:33 -05:00
44d4255628
Added endElo in the appropriate spots.
2016-04-22 00:58:07 -05:00
6d00e8b41f
Refactored Elo to work correctly.
2016-04-22 00:21:11 -05:00
d0e3b094c1
- cleaned up and prepped for live update
2016-04-21 20:57:35 -04:00
86df07123c
Merge pull request #28 from Mineplex-LLC/bugfix/admin-command-npe
...
Fix NPE in AdminCommand from IncognitoManager being null
2016-04-22 10:54:20 +10:00
e46798f20e
Fix NPE in AdminCommand from IncognitoManager being null
2016-04-22 10:49:34 +10:00
e55bec505b
- Fix players ending up teleported back to arena due to broken respawn engine
2016-04-21 20:13:39 -04:00
df55d48ab8
- Looks better
2016-04-21 01:03:14 -04:00
d57cc48f0f
- Added new features!
2016-04-20 22:31:54 -04:00
f86b18b603
Elo Works Now
...
Ready to move on to MCL implementation
2016-04-20 22:09:18 -04:00
2d02d79cec
Fix survival games' Beastmaster wolf spawning
...
Beastmaster wolf spawning suffered from the same issue as the Wizards
"Summon Wolves" spell: spigot has an issue when setting an owner to a
wolf or ocelot without a previous owner. See SpigotUtil for details.
2016-04-20 18:45:54 -05:00
md_5
Keir Nellyer
LCastr0
phobia
cnr
xGamingDudex
Jonathan Williams
AlexTheCoder
Shaun Bennett
Shaun Bennett
Joseph Prezioso Jr.