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

7598 Commits

Author SHA1 Message Date
Keir Nellyer
b1a41c3cb3 Make chat abuse colour easier on the eyes 
Dark blue [bold] is hard to read, dark aqua [bold] should be easier
to read.
 2016-05-07 22:48:49 +01:00
xXVevzZXx
d75ba9d4c0 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants 2016-05-07 22:26:15 +02:00
phobia
38f22b1577 Disable obsidian dropping after breaking THE BLOCK 2016-05-07 19:51:19 +10:00
xGamingDudex
5649939f8c Removed some old disabled code. 2016-05-06 21:59:18 +02:00
xGamingDudex
e04a897488 Added some pre-animation to chicken win effect. Removed some comments. 2016-05-06 21:58:31 +02:00
xGamingDudex
0fea90516b Alternative emerald trail for full set 2016-05-06 13:24:06 +02:00
xGamingDudex
f58db6ee3b Removed firework from party death 
Replaced the death effect with item drops instead
 2016-05-06 13:12:28 +02:00
xGamingDudex
d60fea4f76 Added chicken and guardian win room schematic handlers 2016-05-06 13:00:45 +02:00
Shaun Bennett
60dce9ef1b Change LT, Owner, Developer, Admin to DARK_RED 2016-05-06 13:43:30 +10:00
LCastr0
97ef801e3d Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-05-06 00:40:55 -03:00
LCastr0
49c45628a2 Removed more unused imports 
Fixed some lores and names for cosmetics
Renamed some classes to match Set name
Commented out the Lovely set (Duplicate of Cupid's Love)
 2016-05-06 00:40:22 -03:00
Shaun Bennett
93c2886601 Add boosters to inventory menu 2016-05-06 13:31:59 +10:00
xXVevzZXx
9f2189d173 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
 2016-05-06 03:40:00 +02:00
Conrad
55d40a1a6b Merge pull request #53 from Mineplex-LLC/feature/logitech-brand 
Changed design of billboard and fixed its centering in hubs
 2016-05-05 18:33:15 -04:00
AlexTheCoder
f329051399 Changed design of billboard and fixed its centering in hubs 2016-05-05 18:25:51 -04:00
xGamingDudex
17a4517e71 Merge remote-tracking branch 'origin/develop' into project-cosmetics 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
 2016-05-05 21:03:15 +02:00
xGamingDudex
1a96ea3c18 Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics 2016-05-05 20:29:28 +02:00
xGamingDudex
db21c7dd22 EGit FTW! 
Git, you are the greates, randomly deciding not to include everything
when I spesify you to do so....

This should have been part of prev commit.
 2016-05-05 20:26:00 +02:00
xGamingDudex
875fb4eccd The big bug fix batch 
+ Added some text utils
+ Added angel wing shape

* Tweaked the wing particle effects.
* Fixed item tool not despawning items in arcade servers
* Removed strange gadget disable
* Updated some death/win effects and particles
* Added Illuminated chest
* Added MS skin name to death message
 2016-05-05 20:07:29 +02:00
xGamingDudex
9fca9283e2 Fixed skin layers for Player/Human disguises 2016-05-05 10:39:00 +02:00
Keir Nellyer
e1f2bb9740 Use all-man style braces here to be compliant with the coding standards 
(cherry picked from commit e553ac5)
 2016-05-04 16:02:39 +01:00
Keir Nellyer
a663cb3e01 Revert "Revert "Report system (version 1)"" 
This reverts commit d0d2de1e21.

# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
 2016-05-04 15:24:29 +01:00
Conrad
d7d00e1614 Merge pull request #52 from Mineplex-LLC/alex-mcl 
Add a method for simply checking if a player has been participating i…
 2016-05-04 09:30:00 -04:00
AlexTheCoder
0e509898ec Add a method for simply checking if a player has been participating in the current game, and implement it in the ranked bans system 2016-05-03 21:07:50 -04:00
Conrad
145ea9221a Merge pull request #40 from Mineplex-LLC/clans/beta 
Clans/beta
 2016-05-03 16:57:07 -04:00
LCastr0
cfc6f3703d Merge pull request #50 from Mineplex-LLC/develop 
Merge from develop
 2016-05-03 13:24:32 -03:00
cnr
57fca2a8d0 Temporarily(?) mitigate spigot CME 
During a PlayerVelocityEvent in an unloaded chunk (usually as result of
a teleport), if one calls Location#getChunk() on the player's location,
and the chunk contains persistent entities, the server crashes with a
ConcurrentModificationException.
 2016-05-03 04:56:31 -05:00
xXVevzZXx
838cc2ce31 fix enchantments and increase arrow amount in gladiators 2016-05-02 23:01:59 +02:00
Conrad
3c482e38cc Merge pull request #47 from Mineplex-LLC/feature/logitech-brand 
Convert over to System.out.println() for error messaging and add prot…
 2016-05-02 16:34:58 -04:00
Conrad
2cd76fbf72 Merge pull request #48 from Mineplex-LLC/alex-mcl 
Add catch for rare occurrence where players have no stored data
 2016-05-02 16:34:50 -04:00
AlexTheCoder
3d98c08a67 Add in missing file 2016-05-02 16:33:11 -04:00
AlexTheCoder
ccd5b47d75 Convert over to System.out.println() for error messaging and add protection for billboards in Hub via a new manager 2016-05-02 16:20:41 -04:00
xXVevzZXx
8dd89d9dea fix minor bugs and improve minor things in bridges, sg, uhc, quiver, runner and skywars 2016-05-02 20:27:43 +02:00
Ben
cd2bd8ac1d Fix the TNT Cannon in the tutorial not exploding correctly when fired at the enemy base's doors, as that would cause the tnt entity to just slightly be out of the wall bound and that made the tutorial think that the player missed the wall, making that part of the tutorial near-impossible to pass unless known where to fire exactly. Along with this I also made the cannon rotation lock to a specific range so that people can't miss. Ever. 2016-05-02 11:49:56 +01:00
Ben
8a1b5572a8 Fix players in tutorial receiving messages from the real game whenever the message sender is not in a clan. 2016-05-02 10:31:45 +01:00
LCastr0
055b8684c2 - Added action bar message when booster is ready (Wind Up Suit) 
- Moved each suit to an individual package, to make it easier to work with
- Removed some unused imports
- Added util to get entity egg data
- Added kit modifiers: Beastmaster, Horseman and Necromancer (SG), Apple (Bridges)
- Added specific kit pages to game modifier menu
 2016-05-02 00:13:06 -03:00
xXVevzZXx
71f8640189 implement Dukes of decoration, OP Gladiators, Countdown, Heroes of the ewe, OP Skywars, Ultra spleef, Assassins and Blood diamonds 2016-05-02 01:06:00 +02:00
Ben
026ab15099 Fix multiple leaving messages being broadcasted to the server when a player is kicked from the server after getting cbanned. 2016-05-01 23:20:55 +01:00
Ben
1e18707fd7 Include the missing PlayerMessageEvent, as I had also forgotten to add documentation about the class. 2016-05-01 23:06:30 +01:00
Ben
480cc0f9be Fix NullPointerException when a player leaves the server without their Clans Ban client being loaded into memory beforehand. 2016-05-01 23:04:30 +01:00
Ben
e139bea465 Fix kill messages inserting a space below them in chat. 2016-05-01 23:03:18 +01:00
Keir Nellyer
fa017c185d Add method to load ReportProfile from database 2016-05-01 22:48:02 +01:00
Keir Nellyer
41bc9672ab Remove un-needed imports 2016-05-01 21:49:08 +01:00
Keir Nellyer
ccf14d0d2a Declare final variables in ReportCategory 2016-05-01 21:12:01 +01:00
Keir Nellyer
132f431a94 Map each ReportResult to its id in the database 
We no longer use the statistic system to store the results of reports but rather store the result of each ticket in a database table.
 2016-05-01 21:10:55 +01:00
Keir Nellyer
1d36d4c4b9 Map each ReportCategory to it's id in the database 2016-05-01 21:04:20 +01:00
AlexTheCoder
7e97bd346e Change an internal method to private and add missing class JavaDoc 2016-05-01 15:16:42 -04:00
AlexTheCoder
335c5a4510 Clean up billboard generation and clearing, rewrite MapRender for logos, and add JavaDocs to comply with code standard 2016-05-01 14:58:40 -04:00
xXVevzZXx
6c2caac800 fix some format issues and implement God battles 2016-05-01 19:43:42 +02:00
xXVevzZXx
7bd6cdb93c Implement Lists and Maps into the variable system and finish more gamemodes 2016-05-01 18:48:07 +02:00
Ben
eae972a3e6 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-05-01 10:11:28 +01:00
Ben
9d97ea8d1e Missing Clans ban cache class (to do with the commit previously by me) 2016-05-01 10:11:17 +01:00
cnr
4cffb39941 Delay dismount teleport by one tick 
This mitigates a stack overflow caused by a teleport before a dismount
event processes fully.
 2016-05-01 01:30:42 -05:00
AlexTheCoder
48c8a5a630 Force structure to spawn correctly, complete with maps on item frames 2016-05-01 01:56:07 -04:00
Ben
189f9ad524 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-05-01 01:42:32 +01:00
Ben
2337e89a93 Improvements to the Clans ban system in general as it was performing more operations than required, and accessing the database more than was necessary. Polished up the Clans ban GUI as well. 2016-05-01 01:42:11 +01:00
cnr
8ca38b2598 Prepend http:// to resource pack locations 2016-04-30 18:54:17 -05:00
AlexTheCoder
070326e72d Create systems to automatically create and destroy branding boards, as well as implement the Logitech branding 2016-04-30 19:26:16 -04:00
Keir Nellyer
e553ac5aab Use all-man style braces here to be compliant with the coding standards 2016-04-30 23:12:25 +01:00
Keir Nellyer
bce218a65e Merge branch 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-04-30 23:11:35 +01:00
cnr
10166f063b Merge branch 'develop' into clans/beta 2016-04-30 16:16:57 -05:00
phobia
14204fba5c Changed resource packs to home hosted ones 2016-04-30 16:02:26 -05:00
phobia
890ab9f67e Uncommented ClansBanManager's instances 2016-04-30 16:02:26 -05:00
phobia
f1c2e71d56 Some changes to error handlng for clans regions 2016-04-30 16:02:26 -05:00
cnr
634a34dd52 Reintroduce non-Air constraint to cannon explosion 2016-04-30 16:02:26 -05:00
cnr
2eb7b892e0 Refactor cannon explosion effect for clarity 2016-04-30 16:02:26 -05:00
cnr
f2f627116a Correctly count cannon explosion effect attempts 
Previously, cannon explosions effects could lock up the main thread if:
- The effect location selection RNG was sufficiently unlucky
- The explosion occured sufficiently deep into a larger claimed
  territory
 2016-04-30 16:02:26 -05:00
AlexTheCoder
39c105f0cf Add catch for rare occurrence where players have no stored data 2016-04-30 15:34:04 -04:00
Conrad
d0d2de1e21 Revert "Report system (version 1)" 2016-04-30 14:53:59 -04:00
Conrad
e0e30a8b7f Merge pull request #43 from Mineplex-LLC/alex-mcl 
Fix Async Elo Ranked Bans
 2016-04-30 14:46:49 -04:00
AlexTheCoder
37a815d52a Update JavaDocs to fit Mineplex standard 2016-04-30 14:41:28 -04:00
AlexTheCoder
2e4bae6915 Merge branch 'feature/top-elo' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla 2016-04-30 14:14:14 -04:00
AlexTheCoder
2dc5c46624 Fix naming convention on checkRankBannedAsync 2016-04-30 14:13:21 -04:00
AlexTheCoder
41e26f283c Fix all async elo ranked ban methods and switch to callback system for API hooks 2016-04-30 14:10:09 -04:00
TadahTech
6e35bc0989 Stop spamming the chat. 2016-04-30 00:55:59 -05:00
Keir Nellyer
2490e3df82 Previous git merge cause this single line to be deleted 
I literally have no idea why or how this happened.
 2016-04-29 23:47:01 +01:00
Keir Nellyer
6a00f26d5f Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
#	Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2016-04-29 23:42:27 +01:00
Keir Nellyer
81cebc4ce7 Swap static helpers for a much better solution 
This allows for easier refactoring in the future when we move away
from retrieving the CoreClientManager from a static instance.

Mineplex coding standards are also against the use of static helpers
in scenarios such as this, therefore this commit brings this branch
to be in-line with the coding standards.
 2016-04-29 23:37:40 +01:00
Shaun Bennett
184d247fc9 Start adding BoosterPage. Move Boosters to core to support UI's 2016-04-29 17:37:34 +10:00
phobia
f63a872bd4 Changed resource packs to home hosted ones 2016-04-29 14:46:14 +10:00
AlexTheCoder
a8d9745320 - Fixed order of Top Elo 2016-04-29 00:12:25 -04:00
phobia
c814fc73f7 Uncommented ClansBanManager's instances 2016-04-29 12:53:20 +10:00
TadahTech
26f6a1189f Prettyfy EloCommand 2016-04-28 21:34:43 -05:00
TadahTech
e83e4b270c Prettyfy EloCommand 2016-04-28 21:34:07 -05:00
TadahTech
00efb7d72e Fix ELO query 2016-04-28 21:20:48 -05:00
TadahTech
84ca13c0d3 Fix ELO query 2016-04-28 21:09:28 -05:00
TadahTech
80ea7b7a4c Fix ELO query 2016-04-28 21:09:07 -05:00
TadahTech
5a4f89b484 Fix ELO query 2016-04-28 21:04:07 -05:00
AlexTheCoder
7c279998ec - Changed top elo queries 2016-04-28 21:55:51 -04:00
AlexTheCoder
8e68d62356 - Added documentation for new EloManager methods 2016-04-28 21:16:18 -04:00
AlexTheCoder
2887630cf8 - Added javadoc headers 2016-04-28 21:11:38 -04:00
AlexTheCoder
4b7684da4c Merge branch 'feature/top-elo' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla 2016-04-28 21:05:56 -04:00
AlexTheCoder
e032b81842 - Made SQL calls async 2016-04-28 20:59:49 -04:00
TadahTech
562e950361 Remove File headers. 2016-04-28 19:46:13 -05:00
TadahTech
680e579223 Merge Alex's branch into mine. 
Convert to Java 8
Remove unneeded comments.
 2016-04-28 19:39:24 -05:00
TadahTech
168483a9fc Communities work 2016-04-28 19:30:05 -05:00
TadahTech
725481f310 Top Elo data for Webpage 2016-04-28 19:23:57 -05:00
TadahTech
84c0b1b389 Top Elo data for Webpage 2016-04-28 19:22:45 -05:00
AlexTheCoder
156982460f - Fixed water permanently [MCL] 
- Fixed team balancing [MCL]
- Fixed overjoining [MCL]
- Changed bans for quitting ranked matches [MCL]
 2016-04-28 20:03:09 -04:00
Keir Nellyer
5dbb3744d1 Improve reputation map initialization logic 2016-04-28 23:52:26 +01:00
Keir Nellyer
c82dd27b64 Make getValueOf method more robust 2016-04-28 23:36:41 +01:00
AlexTheCoder
b105ccb5f1 - Change event priority 2016-04-28 17:48:16 -04:00
AlexTheCoder
b13528ed66 - Further blockage of creating source blocks [MCL] 2016-04-28 17:46:57 -04:00
AlexTheCoder
3f9ef24235 - Removed debug message 2016-04-28 17:44:37 -04:00
William Burns
5d1194192d Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/jobs-site 2016-04-28 18:19:45 +01:00
Keir Nellyer
bff5751691 Remove very last @author tag 2016-04-28 14:41:44 +01:00
AlexTheCoder
dcd376b837 - Improved graphics for Elo display in /stats 2016-04-28 01:01:14 -04:00
AlexTheCoder
189296a586 - Fixed using water in restricted zones in MCL 
- Implemented Elo in /stats menu
 2016-04-28 00:53:04 -04:00
AlexTheCoder
46f873634e - Decrease time till Overtime in MCL 
- Block ability to flood in MCL
 2016-04-28 00:33:36 -04:00
AlexTheCoder
b4c5be81f3 - Fixed random weather in MCL 
- Added Elo Division display to /stats for applicable games
- Made fishing rods kept on death in MCL
 2016-04-27 23:12:38 -04:00
William Burns
d90e9e7dff Add a system for allowing all players to use game commands when in the correct mode. 2016-04-27 20:54:52 +01:00
William Burns
b8d12c0c9d Small wording changes. 2016-04-27 20:04:36 +01:00
xXVevzZXx
1b5b18c9b2 Prevent exception while adding variables to gamemodes 2016-04-27 17:50:01 +02:00
xXVevzZXx
aa219ec3e5 Implement gamemode feature with modifiable variables and working on first moded games 2016-04-27 17:42:50 +02:00
AlexTheCoder
a16145479e - Disabled picking up lava 
- Leaving ranked matches temp bans players from rejoining them
 2016-04-27 03:18:44 -04:00
LCastr0
d0e7590b2a Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-04-26 23:23:45 -03:00
LCastr0
a7ef8bec49 Adds new constructor to NotePlayer, to be able to send the song to specific players 
Some WindUp costume fixes
Added actionbar and song to WindUp suit
Created new booster manager
 2016-04-26 23:21:59 -03:00
xGamingDudex
38d03b8468 Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics 2016-04-27 00:03:29 +02:00
xGamingDudex
79f210e242 Schematic and WinEffect update 
+Added better schematic support
+Fixed schematics not sending block updates to nearby players
+Added win room schematics
*Tweaked some of the win rooms
+Added sounds to the Lava Trap win effect.
 2016-04-27 00:01:30 +02:00
Shaun Bennett
41e2ea6490 Fix off by one error in GoalCounter 2016-04-26 16:20:14 +10:00
Shaun Bennett
714000163b Add messages when fountain is complete and resets 2016-04-26 16:19:27 +10:00
Shaun Bennett
4a8c38e1c8 Add fountain reset command 2016-04-26 15:33:52 +10:00
Shaun Bennett
cabf4c4c8b Add BlockProgressBar for Gem Fountain 2016-04-26 15:26:07 +10:00
Shaun Bennett
e8370579c0 Counter refactoring 2016-04-26 13:55:06 +10:00
LCastr0
f0cfac8e73 Merge pull request #31 from Mineplex-LLC/develop 
Merge from develop
 2016-04-24 23:15:36 -03:00
LCastr0
28de514d1a Adds some utils for UtilColor 
Small changes in Wind Up suit
 2016-04-24 21:39:35 -03: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
Shaun Bennett
a0fd852537 Move field to top of class in Game 2016-04-24 13:38:58 +10:00
Shaun Bennett
b21dfad12e Merge remote-tracking branch 'remotes/origin/develop' into feature/gems 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
 2016-04-24 13:37:45 +10:00
Shaun Bennett
c60beec68c Implement Fountain GUI 2016-04-24 12:40:38 +10:00
LCastr0
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
phobia
b21939444c Some changes to error handlng for clans regions 2016-04-23 16:40:39 +10:00
cnr
c7970d1bd0 Prevent super paintball spectators from reviving teammates. Fixes PC-103 2016-04-22 19:48:03 -05:00
xGamingDudex
ccd630e2ae Leftovers from merge 2016-04-23 00:56:19 +02:00
xGamingDudex
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
Jonathan Williams
fe0cee65e8 Added gem and coin rewards back into bonus. 2016-04-22 05:33:25 -05:00
Jonathan Williams
260c617007 Merge remote-tracking branch 'remotes/origin/alex-mcl' into develop 2016-04-22 05:12:30 -05:00
Jonathan Williams
e28621ae26 Set oldElo equal to new elo on new row. 2016-04-22 05:04:13 -05:00
AlexTheCoder
2a4c3209b4 - Enable ELO 2016-04-22 05:44:56 -04:00
AlexTheCoder
70541fd6f2 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla 2016-04-22 05:41:24 -04:00
Jonathan Williams
d73b720323 Merge branch 'features/elo' into develop 2016-04-22 04:34:35 -05:00
Jonathan Williams
477acf044e Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop 2016-04-22 04:34:21 -05:00
Jonathan Williams
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
Jonathan Williams
7b18efa7b0 Prevent farming elo up with multiple games by dc and joining new game. 2016-04-22 04:05:07 -05:00
Jonathan Williams
ddd1c5af9b Removed EloSettings and fixed scoreboard. 2016-04-22 03:10:09 -05:00
Jonathan Williams
34f94c0381 Reverted scoreboard because of MC maxlines turd nugget. 2016-04-22 02:55:27 -05:00
Jonathan Williams
a31eccc15b Multiply new rating by team size. MIssed that undo! 2016-04-22 02:53:02 -05:00
Jonathan Williams
4577cf0398 Fixed scoreboard :D 2016-04-22 02:47:48 -05:00
Jonathan Williams
7cc4811ede Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into features/elo 2016-04-22 02:39:35 -05:00
Jonathan Williams
f922be51fe Scoreboard tweak. 2016-04-22 02:39:08 -05:00
AlexTheCoder
04fe30df43 - Fix sb 2016-04-22 03:38:20 -04:00
AlexTheCoder
5e255fc4ed Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix 2016-04-22 03:36:21 -04:00
Jonathan Williams
757c945320 Added in kFactor ratio application to rating delta. 2016-04-22 02:35:37 -05:00
AlexTheCoder
03bdc8d2db Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix 2016-04-22 03:17:54 -04:00
Jonathan Williams
b69a75355c Fixed scoreboard alignment. 2016-04-22 02:17:40 -05:00
Jonathan Williams
aa6d25139f Tweaked elo for team games. 2016-04-22 02:04:57 -05:00
AlexTheCoder
b1c05e2ed0 Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix 2016-04-22 02:12:02 -04:00
Jonathan Williams
776093288a Fixed rating not setting in EloPlayer constructor. 2016-04-22 01:11:48 -05:00
AlexTheCoder
2d2c8858e6 Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix 2016-04-22 02:06:55 -04:00
AlexTheCoder
1d3ad3c5fd - Enabled ELO for testing 2016-04-22 02:06:37 -04:00
Jonathan Williams
977fbe684a Fixed elo query. 2016-04-22 01:06:33 -05:00
Jonathan Williams
44d4255628 Added endElo in the appropriate spots. 2016-04-22 00:58:07 -05:00
Jonathan Williams
6d00e8b41f Refactored Elo to work correctly. 2016-04-22 00:21:11 -05:00
Shaun Bennett
8a5fdccb60 Add to fountain button 2016-04-22 11:26:05 +10:00
AlexTheCoder
d0e3b094c1 - cleaned up and prepped for live update 2016-04-21 20:57:35 -04:00
Shaun Bennett
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
Shaun Bennett
e46798f20e Fix NPE in AdminCommand from IncognitoManager being null 2016-04-22 10:49:34 +10:00
AlexTheCoder
e55bec505b - Fix players ending up teleported back to arena due to broken respawn engine 2016-04-21 20:13:39 -04:00
Shaun Bennett
435d3968a2 Fix Fountain string being changed to Counter from refactor 2016-04-21 19:46:20 +10:00
AlexTheCoder
df55d48ab8 - Looks better 2016-04-21 01:03:14 -04:00
AlexTheCoder
d57cc48f0f - Added new features! 2016-04-20 22:31:54 -04:00
Joseph Prezioso Jr.
f86b18b603 Elo Works Now 
Ready to move on to MCL implementation
 2016-04-20 22:09:18 -04:00
Shaun Bennett
54f0b99756 Add fountain gui command 2016-04-21 11:41:16 +10:00
cnr
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
Joseph Prezioso Jr.
2d45ab61cc Elo re-calculated 
Elo is now being incremented more consistently (and not multiple times)
 2016-04-20 15:48:27 -04:00
Joseph Prezioso Jr.
6a5c8336cf Elo and Division fixed 
Elo and Division should be displaying properly

Cleaned the code up a bit

Added endElo() to Game.java to handle team Elo code

Added event listener to check for GameState.End in TDM to call endElo()
 2016-04-20 14:52:06 -04:00
AlexTheCoder
588e6f08c2 - Removed TypeWars achievements to make room 2016-04-19 18:07:20 -04:00
LCastr0
793f5b3f41 Test gadget added by LCastr0, to get used to the code 2016-04-19 15:20:31 -03:00
LCastr0
2b80ebabf7 Test gadget added by LCastr0, to get used to the code 2016-04-19 15:14:22 -03:00
cnr
ef8474ae9d Set default CustomExplosion maxFallingBlocks to 0 
This fixes an exception thrown when the trap rune in Wizards is
activated.
 2016-04-19 02:59:31 -05:00
cnr
bda9772ba6 Mitigate spigot issue when setting wolf owner 
This fixes the Summon Wolves spell in Wizards.

Explanation:

- Wolves keep track of their most recent owner.
- When a wolf is assigned a new owner, it updates the data
  watcher with the new owner's UUID
- During this process, the old owner's UUID is checked
  against the new one
- If the wolf didn't have a previous owner, the old owner's
  UUID is the empty string.
- UUID.fromString() is called on the empty string, and throws
  an exception.
 2016-04-19 02:46:38 -05:00
Shaun Bennett
cb48df6a3d Update fountain count every 5 seconds. Display Hologram 2016-04-19 14:30:38 +10:00
Shaun Bennett
6dc2559dd1 Merge remote-tracking branch 'remotes/origin/md_5/boosters' into feature/gems 2016-04-19 13:57:33 +10:00
Shaun Bennett
5a667a7d31 Add /fountain command. Fountain implementation 2016-04-19 13:57:19 +10:00
AlexTheCoder
e08965aa25 - Fixed TowerDefender being too difficult to obtain 
- Fixed wither attacking own towers by accident
 2016-04-18 22:58:55 -04:00
AlexTheCoder
6c20427395 - Fixed some bugs and added final achievements 2016-04-18 22:32:15 -04:00
AlexTheCoder
17ac3cb597 - Fix armor checking 
- Edit wither death message
 2016-04-18 20:29:53 -04:00
AlexTheCoder
10aba533f3 - Remove all dependence on UtilShapes 2016-04-18 19:59:55 -04:00
AlexTheCoder
34399db6e8 - Fixed missing GameType 2016-04-18 18:42:56 -04:00
xGamingDudex
d9b6434bad Typo in description 2016-04-18 23:24:59 +02:00
xGamingDudex
534a5dee4e Forgot to remove debug message 2016-04-18 22:18:42 +02:00
xGamingDudex
591d3cadc9 Cleaned up some GUI stuff, mostly lores on items 2016-04-18 22:16:10 +02:00
xGamingDudex
e45f800519 Fixed damage calculator error 2016-04-18 20:36:22 +02:00
md_5
9de990744d Stage 2016-04-18 17:46:38 +10:00
AlexTheCoder
44263beb87 - Make elo store/recover properly 2016-04-17 17:34:18 -04:00
cnr
4227e24ae0 Reintroduce non-Air constraint to cannon explosion 2016-04-17 16:29:23 -05:00
cnr
e375db5aec Refactor cannon explosion effect for clarity 2016-04-17 13:33:44 -05:00
AlexTheCoder
ee30012011 Merge branch 'feature/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix 2016-04-17 12:27:23 -04:00
AlexTheCoder
d623d0982b Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla-merge 2016-04-17 12:02:08 -04:00
AlexTheCoder
4c35e35fc0 - More polish and bugfixes 2016-04-16 23:59:44 -04:00
Shaun Bennett
4477a215f4 Update to Redis 2.8.1 and clean up repositories (#26) 2016-04-16 22:51:20 -05:00
Shaun Bennett
fed9f675d3 Implementation for basic Fountains 2016-04-17 13:51:15 +10:00
Shaun Bennett
9c2cd6a883 Merge branch 'feature/redis-update' into feature/gems 2016-04-17 13:08:11 +10:00
Shaun Bennett
16dacbe3b3 Update to Redis 2.8.1 and clean up repositories 2016-04-17 12:58:44 +10:00
AlexTheCoder
35d7dd8b44 - Fixed stuff 2016-04-16 20:36:19 -04:00
AlexTheCoder
b0d30a4ff4 - cleaned everything up 
- renamed game
 2016-04-16 20:32:14 -04:00
AlexTheCoder
d8f5ac66fc - More chiss 2016-04-16 14:05:46 -04:00
xGamingDudex
696088b57e Fixed gun stats between games 2016-04-16 18:16:53 +02:00
cnr
9c6d23f11e Correctly count cannon explosion effect attempts 
Previously, cannon explosions effects could lock up the main thread if:
- The effect location selection RNG was sufficiently unlucky
- The explosion occured sufficiently deep into a larger claimed
  territory
 2016-04-16 07:31:00 -05:00
Joseph Prezioso Jr.
bbb81dd663 Elo calls migrated to Game.java 
Consequently, elo code is actually being called now

Bukkit.broadcastMessage calls have shown where things are breaking

handleElo() added to EloManager to facilitate movement of team elo code

preparing to use EloManager's getNewRatings() method to 
calculate team elos
 2016-04-15 20:48:56 -04:00
xGamingDudex
ffc0459e5a Cosmetic Update 
+ Support for relative copy position from with //copy from worledit in
schematics
+ Better block selection in bounding box in UtilBlock
+ Goal selector utils for entities
+ Global hide and show methods for players
+ Win effects and game modifiers
+ Tweaked player disguises
+ Added clean room generator to arcade games, previously normal flat
world
+ Animation utils

* Edited some particles, hats and death animations
 2016-04-16 02:24:41 +02:00
Jonathan Williams
2b2b251548 Merge branch 'clans/beta' into develop 2016-04-15 12:41:14 -05:00
Jonathan Williams
019cfe41cc Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-15 12:40:54 -05:00
Jonathan Williams
609eb562e9 Merge branch 'clans/beta' into develop 2016-04-15 12:40:26 -05:00
Jonathan Williams
a730b81feb Commented out TournamentManager, moving off develop. 2016-04-15 12:38:25 -05:00
Jonathan Williams
b43953439e Properly store teamId locally after registering for tournament. 
Use team id when unregistering for the tournament.
 2016-04-15 12:36:28 -05:00
Jonathan Williams
cf3141ddc0 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop 2016-04-15 12:30:32 -05:00
cnr
77b6515387 Don't break the repair anvil more than twice 2016-04-15 12:21:25 -05:00
cnr
91d5851628 Don't set a clan's lastOnline time to Timestamp(0) 
Partially reverts f011fdad5f
 2016-04-15 12:21:25 -05:00
AlexTheCoder
09f9ae3b7a - Update for playability 2016-04-14 23:05:14 -04:00
AlexTheCoder
33b557eb10 - Huuuuuuuge amount of changes for chiss 2016-04-14 22:45:21 -04:00
Joseph Prezioso Jr.
4a4e64a3ff EloRepository overhaul started 
Tinkering with EloRepository, using AccountRepository as a base
 2016-04-14 20:09:09 -04:00
Jonathan Williams
64d5f91e8f Remove TeamInvite table. 2016-04-14 18:49:20 -05:00
Ben
0a32eed15d Fix Cannon TNT firing in the wrong direction and clean up the projectile code, making it more modular. 2016-04-15 00:43:55 +01:00
Joseph Prezioso Jr.
742807d80e Added generatePlayerElos and updated saveDivision 
Added method to fill EloManager's playerElos hashmap with values
--This may not work as intended
--Currently only implemented in Team Death Match
 2016-04-14 17:17:26 -04:00
Joseph Prezioso Jr.
eb67c12108 Added getRepoElo to EloRepository 
Added Bukkit.broadcastMessage() calls to test code

Methods that needed to throw SQLExceptions now throw SQLExceptions
 2016-04-14 15:21:28 -04:00
Jonathan Williams
3a26225ce2 Finished main tournament calendar UI. 
Added registration for tournaments.
 2016-04-14 12:21:24 -05:00
phobia
29b3f03abf Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-14 21:38:48 +10:00
phobia
cbc6689782 Disable /kill in tutorial and reset food level after hold position 2016-04-14 21:38:37 +10:00
Ben
eab76fefa2 Fix Cannons sometimes glitching out when the owner's clan is deleted. 2016-04-14 12:09:42 +01:00
Ben
3bf3eba005 Completely cancel the explosion falling block for claimed territories. 2016-04-14 12:08:54 +01:00
Ben
a295cade1c Fix Cannon TNT sometimes breaking blocks in protected regions 2016-04-14 11:35:12 +01:00
cnr
ab21efd2ca Give the correct amount of old/ancient chests for bonuses 2016-04-13 18:51:52 -05:00
cnr
6b2f601c7a Prevent a spectator race condition in arcade games 
Previously, a player would erratically become a spectator if s/he
spammed the "spectate next player" action between rounds (i.e.
left-click while spectating a player).
 2016-04-13 18:20:39 -05:00
Joseph Prezioso Jr.
9e8a7b582b Elo updates 
EloRanking turned on for Domination, Team Deathmatch, Turf Wars, CTF

Database QoL changes made to EloManager and EloRepository
--Unfortunately, Database still seems to not be updating properly
--Something on my end, or something to do with the queries? Unsure.
 2016-04-13 18:35:56 -04:00
cnr
6d01e235fd Fix online friends list 
Previously, it was incorrectly asserting that all players were
incognito. If we want to exclude incognito players, we'll have to find a
different way.
 2016-04-13 17:24:46 -05:00
Jonathan Williams
85f4ff1299 Starting on Tournaments. 2016-04-13 17:14:48 -05:00
cnr
91c97e38b8 Prevent players from naming their pets "ULTRA" 
This was being used to fool support into thinking the player had won
Ultra from a chest
 2016-04-13 16:37:13 -05:00
William Burns
b54da22dd8 Create a basic site design for potential job applicants. 2016-04-13 21:06:47 +01:00
Ben
7cc0583d8e Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-13 19:52:49 +01:00
Ben
355ab06e6c Fix the Conquering attribute working for player attacks as well 2016-04-13 13:08:04 +01:00
Ben
a26403f006 Fix Recall & Smokebomb not working regularly 2016-04-13 13:04:43 +01:00
cnr
6428dfd723 Run clan-load callbacks on the main thread 
This prevents potential CMEs from occurring when a player transfers
his/her clan to another server
 2016-04-12 22:54:20 -05:00
Ben
e9d05474f8 Prevent cannons from changing bedrock into charred blocks 2016-04-12 17:14:48 +01:00
Ben
c0ebae4175 Ender chest blocker not actually canceling the opening event. 2016-04-12 17:13:03 +01:00
phobia
11d92c49ec Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-12 09:48:59 +10:00
Ben
eefed175ec Add the random world event command. 2016-04-11 18:07:11 +01:00
Ben
b313bc5308 Make undead chests not show the 'you are not permitted to use ender chest' messages. 2016-04-10 16:52:54 +01:00
Ben
313b59d1d6 Fix the terrain finder miscalculating the size of undead camps 2016-04-10 16:51:42 +01:00
Ben
e014f4fff9 Fix null pointer in the tutorial when using /tutorial finish 2016-04-10 16:51:12 +01:00
Ben
159a5403ac Fix rare item duplication bug with Smoke Bomb (was told that it's just like the Recall duplication bug) 2016-04-10 16:47:46 +01:00
Ben
db8ca31567 Fix Meridian Scepter not being perfectly accurate. 2016-04-10 16:16:53 +01:00
Ben
0ac9747df1 Modifying how the Meridian Scepter picks a target, as the previous logic was a bit flawed. 2016-04-10 15:27:20 +01:00
Ben
9a2f4a8936 Fix Meridian Scepter not damaging the victim (would just give the wither effect) 2016-04-10 15:23:43 +01:00
Ben
fe89a5b68e Fix the Recall rare item duplication bug 2016-04-10 14:50:00 +01:00
Ben
67a36dc7e4 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-10 12:56:30 +01:00
Ben
66274188c8 Add a /we random command to spawn a random world event 2016-04-10 12:56:00 +01:00
Ben
37bb64bffd Fix Undead Camps from spawning outside of the World Border. 2016-04-10 12:47:56 +01:00
Ben
3ee1f86841 Fix Null Pointers in the ender chest blocker and regular chest blocker for incognito staff. 2016-04-10 12:36:31 +01:00
Ben
8ee2c02dd9 Disable the use of Ender Chests 2016-04-10 11:20:51 +01:00
Ben
e8e73306be Change the Giant's Broadswords regeneration effect level from 41 to 3 2016-04-10 11:15:43 +01:00
Ben
dd3e009413 Remove silent chest opening mechanism (which was completely broken), and instead don't allow incognito staff to open chests 2016-04-10 10:53:07 +01:00
Conrad S
ccf9d4a4c2 Merge remote-tracking branch 'origin/clans/beta' into clans/beta 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/repository/SiegeWeaponRepository.java
 2016-04-09 13:01:04 -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
Ben
4bf19eebad Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-09 00:37:40 +01:00
Ben
92195a12d2 Completely rework Cannon explosions to use the vanilla Minecraft explosions, as those seem to look much more visually appealing, and have less issues. 
Fixed a loading and saving bug with Cannons, they seem to be a lot more stable now than before.
 2016-04-09 00:37:20 +01:00
Keir Nellyer
56b0a886bf
Add helper method for setting common item meta values 2016-04-09 00:36:04 +01:00
Ben
6e9ae04118 Cut Gem to Gold conversion rate down to 16 Gems per Gold, instead of 32 2016-04-09 00:27:24 +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 S
05b31725a8 Fix initialization NPE. 2016-04-08 18:48:16 -04:00
Ben
a04f7c23c6 Disable incognito for staff in hub invisibility, and vice-versa 2016-04-08 20:18:56 +01: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
79a2ef3608 Fix staff members getting unhidden when in incognito whenever players are shown to the player (can happen when a regular player toggles player vision, and the staff member gets shown to all other players.) 2016-04-07 22:24:47 +01:00
Joseph Prezioso Jr.
59001bdef6 Fix merge-related errors 
Fix, polish, and re-implement Elo code.
 2016-04-07 16:40:30 -04: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
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
Joseph Prezioso Jr
91e550bdcc Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/outpost/Outpost.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/SiegeWeapon.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/command/FinishCommand.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/command/TutorialCommand.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/BlowUpWallGoal.java
 2016-04-06 19:40:01 -04:00
Joseph Prezioso Jr
a07e71ba08 GameOption takes a generic value to eliminate the need for more than the one GameOption class. 
Remove the--now unnecessary--classes that inherited from GameOption.

Consequently, the creation and implementation of GameOptions should be much more efficient.

Note: it may be necessary to add decimal points to doubles and to cast 'long' data types as 'long'.

The above note generally applies to numerical values, but may apply to other values, as well.
 2016-04-06 18:10:31 -04:00
Joseph Prezioso Jr
f030f78f08 Add headers to new classes, so as to comply with coding standards. 
To that end, change methods to camel case and refactor them, so that the newly-renamed methods do not result in errors.
 2016-04-06 16:20:26 -04:00
Ben
d75d63a81a some missing files and blacklist barrier block from block toss 2016-04-06 18:26:56 +01:00
Jonathan Williams
8b42de03cb Debug messages for PoisonShock 2016-04-06 10:39:00 -05: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
Joseph Prezioso Jr
09db5a8131 I'm committing this so I can checkout to a different branch 2016-04-05 16:41:50 -04:00
Joseph Prezioso Jr
c6c52885a9 Fixed commit 2016-04-05 15:16:40 -04: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
phobia
b0dd51843b Ride horse delay 2016-04-05 10:58:31 +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
Jonathan Williams
2d296d9226 Removed debug ResourcePack Message 2016-04-04 17:45:34 -05:00
Jonathan Williams
efa18d394b Fixed Incognito not saving status. 2016-04-04 17:45:10 -05:00
Jonathan Williams
2fa0787792 Clans now load, added connection property to null zero date timestamps. 2016-04-04 16:31:37 -05:00
Jonathan Williams
2b3e466469 Removed pesky '?' causing login query to stall. 2016-04-04 16:30:57 -05:00
Ben
7de23216f6 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-04 20:41:10 +01:00
Ben
b3b72f1ca0 commenting out clans bans 2016-04-04 20:40:58 +01:00
Jonathan Williams
02459c6a10 Fixed bad implementation of IncognitoManager that was locking up threads. 
Temporarily disabled MessageManager's handling of Incognito.
 2016-04-04 13:48:26 -05:00
Jonathan Williams
60010f90b4 Load simple clan token on player login to reduce overhead. 
Increased dbpool connections to 4
 2016-04-04 13:47:45 -05:00
Jonathan Williams
a91ef68978 Fixed CCM in WarPointEvasion. 
Removed debug message; NOT RIDER
 2016-04-04 13:46:39 -05:00
Jonathan Williams
e2baf2b56c Updated Clans to use the new ResourcePackManager.setResourcePack method. 2016-04-04 13:46:00 -05:00
Jonathan Williams
1b1e6f6ef5 Moved the redis operation before asking for a mysql connection 2016-04-04 13:45:20 -05:00
Jonathan Williams
781c4bfdbd Removed db call off main thread for ClanServerPage 2016-04-04 10:31:13 -05:00
Jonathan Williams
91ddac9643 Added world checking for boundary stuff. 2016-04-04 10:30:59 -05:00
Jonathan Williams
e8da5ca0f2 Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-04 10:02:01 -05:00
Jonathan Williams
228a001696 Added Shift Left clicking to the ban list for Cannon :D 2016-04-04 10:01:50 -05:00
Shaun Bennett
ff929a8515 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 00:57:28 +10:00
Ben
14207c2073 clansbans 2016-04-04 14:56:20 +01:00
Ben
8330ef560d not rider spam 2016-04-04 14:55:47 +01:00
Shaun Bennett
fecd3c1eaa Final changes 2016-04-04 23:28:38 +10:00
Ben
02cb0e1f7e Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java
 2016-04-04 13:52:44 +01:00
Ben
1dde17b9cc shooters still shotting fix 2016-04-04 13:51:05 +01:00
phobia
e85a1e6a3b fixes to breakingand placing in claim 2016-04-04 22:22:07 +10:00
phobia
4262a4d4b7 Increase radius + delete iron doors after done 2016-04-04 22:07:58 +10:00
phobia
963bba06f7 fix for displaying territorial movements 2016-04-04 17:47:58 +10:00
phobia
2e0c9d3965 Remove potatoe message 2016-04-04 17:34:39 +10:00
phobia
aaccb6fd48 Join/leave/death messages 2016-04-04 17:20:21 +10:00
Shaun Bennett
15c4b2dd58 Merge remote-tracking branch 'origin/clans/beta' into clans/beta 2016-04-04 17:11:15 +10:00
Shaun Bennett
23e116f9b5 Region fixes 2016-04-04 17:10:52 +10:00
phobia
56a087612b Changes to explain energy goal 2016-04-04 16:58:16 +10:00