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

2795 Commits

Author SHA1 Message Date
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 a31eccc15b Multiply new rating by team size. MIssed that undo! 2016-04-22 02:53:02 -05:00
Jonathan Williams 757c945320 Added in kFactor ratio application to rating delta. 2016-04-22 02:35:37 -05:00
Jonathan Williams aa6d25139f Tweaked elo for team games. 2016-04-22 02:04:57 -05:00
Jonathan Williams 776093288a Fixed rating not setting in EloPlayer constructor. 2016-04-22 01:11:48 -05:00
Jonathan Williams 977fbe684a Fixed elo query. 2016-04-22 01:06:33 -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 e46798f20e Fix NPE in AdminCommand from IncognitoManager being null 2016-04-22 10:49:34 +10:00
Shaun Bennett 435d3968a2 Fix Fountain string being changed to Counter from refactor 2016-04-21 19:46:20 +10: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
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
Shaun Bennett cb48df6a3d Update fountain count every 5 seconds. Display Hologram 2016-04-19 14:30:38 +10:00
Shaun Bennett 5a667a7d31 Add /fountain command. Fountain implementation 2016-04-19 13:57:19 +10:00
AlexTheCoder 6c20427395 - Fixed some bugs and added final achievements 2016-04-18 22:32:15 -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
AlexTheCoder 44263beb87 - Make elo store/recover properly 2016-04-17 17:34:18 -04: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 b0d30a4ff4 - cleaned everything up 
- renamed game
 2016-04-16 20:32:14 -04: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 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
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
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
cnr ab21efd2ca Give the correct amount of old/ancient chests for bonuses 2016-04-13 18:51:52 -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
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
Keir Nellyer 6efb8d806d
Re-enable category threshold check 
This was disabled for testing reasons.
 2016-04-09 00:02:59 +01: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
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
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 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 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
Joseph Prezioso Jr 09db5a8131 I'm committing this so I can checkout to a different branch 2016-04-05 16:41:50 -04: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 7f92a3c048 incognito changes 2016-04-05 00:38:27 +01: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 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 1b1e6f6ef5 Moved the redis operation before asking for a mysql connection 2016-04-04 13:45:20 -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
Shaun Bennett e11a9379b9 More tutorial tweaking 2016-04-04 12:32:22 +10:00
Jonathan Williams 401127caa9 Reworked Monthly bonuses so they always succeed and it logs them. 2016-04-03 01:36:30 -05:00
Jonathan Williams ff41ad248a Removed PvpTimer 
Fixed issue where StatManager and FriendManager were created twice.
 2016-04-02 02:47:17 -05:00
Jonathan Williams fa6d18b0fa Fix sync db call inside sendMessage 2016-04-01 22:43:09 -05:00
Cheese 8f959a73eb debug 2016-04-02 12:46:25 +11:00
Cheese 9969b7d783 support for resource packs for different MC versions 2016-04-02 11:39:40 +11:00
Joseph Prezioso Jr 6e23a17acb Removed unnecessary code. 2016-04-01 16:01:57 -04:00
William Burns 4ec833727f PC-20 - Detailed Objective Text 2016-03-31 18:45:17 +01:00
Joseph Prezioso Jr cbb9798c35 Added AdjustPlayertElo method to increment/decrement the Elo's of individual players at the end of a game. Currently calling the new method in AnnounceEnd. 2016-03-31 12:49:22 -04:00
Joseph Prezioso Jr b1c29a4fa6 Setup proper Elo brackets with the top 1% being placed in diamond. Also changed starting Elo to 1400 (middle of Iron 1), leaving Coal as a purely regressive division. 2016-03-30 16:06:30 -04:00
Joseph Prezioso Jr 00ee594f28 Missed one file last time 2016-03-29 17:50:45 -04:00
Joseph Prezioso Jr 6048c97b52 Tweaks to clean/clarify things 2016-03-29 17:50:06 -04:00
Joseph Prezioso Jr 51cd770d38 Changes to help smooth the transition into using EloSettings. 2016-03-29 16:00:57 -04:00
Joseph Prezioso Jr 35fc5223b1 reverted previous changes back to lastIndexOf (and altered comments accordingly) on the advice of SJSampson (with whom Sigils agreed) 2016-03-29 14:03:21 -04:00
Joseph Prezioso Jr 0c479e1562 Made change to Elo calculation under Sigils' advisement. Now using indexOf, rather than lastIndexOf to find Elo 2016-03-29 14:00:59 -04:00
Joseph Prezioso Jr f496392c5a EloDivision class created. 
EloManager can now calculate division ranking (EloDivision can also do this once we are ready for it to)
 2016-03-29 13:49:59 -04:00
Joseph Prezioso Jr 38a079846d Some basic ideas for Elo I will be experimenting with 2016-03-28 18:14:52 -04:00
Shaun Bennett caf8170a32 Tutorial Changes 2016-03-27 08:47:34 +11:00
William Burns c1adb7e1bc Remove Slack attachment functionality (for now). 2016-03-26 13:12:59 -04:00
William Burns 29966195ee Create an API for sending Slack message to multiple teams and channels. 2016-03-26 13:07:41 -04:00
AlexTheCoder 6678dffb61 - Updated everything for Sigils and chiss 2016-03-25 20:25:43 -04:00
Ben f000360565 missing a few files 2016-03-24 19:29:45 +00:00
Shaun Bennett 3d473ad00a Merge remote-tracking branch 'origin/clans/beta' into clans/beta 2016-03-23 20:39:21 +11:00
git 4dd756286e Fix small resource pack bug 2016-03-23 20:32:13 +13:00
Shaun Bennett e8dcc4a3e2 Merge branch 'develop' into clans/beta 
# Conflicts:
#	Plugins/Mineplex.Cache/src/mineplex/cache/player/PlayerCache.java
#	Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
#	Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2016-03-23 11:02:20 +11:00
Shaun Bennett 1e73adf2af Increase ram and cpu for event server 2016-03-23 10:23:04 +11:00
Shaun Bennett 656780d027 Change runAsync in MiniPlugin to use our own thread pool 
This allows the tasks to run immediately. Using Bukkit's scheduler the async task wont start until the next server tick
 2016-03-23 10:22:40 +11:00
Shaun Bennett da9a642a6d Process item for treasure before opening 2016-03-23 10:21:36 +11:00
Shaun Bennett 309b5464f2 Clean up Account Repository, attempt to load account ID from cache 2016-03-23 10:21:02 +11:00
Shaun Bennett 85cb065d5c Merge pull request #14 from Mineplex-LLC/Dual_1.9 
1.9 Bugfixes + Ring game
 2016-03-22 19:25:37 +11:00
Shaun Bennett 61b79fab9d Merge pull request #13 from Mineplex-LLC/PC-15 
Fix PC-13, PC-15, PC-16, PC-17
 2016-03-21 20:31:58 +11:00
md_5 55e64a09b9 Test Gem Booster Item 2016-03-21 20:08:40 +11:00
Jonathan Williams b4dfeb224b Reduced NCP exempt time by .5s. 2016-03-21 02:06:11 -05:00
Jonathan Williams 8427ead097 Changed how currency types is initialized to avoid possible NPE 2016-03-19 15:33:16 -05:00
Ben 995d454f87 tutorial additions. 2016-03-18 02:47:51 +00:00
Ben a4cbe54c78 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
 2016-03-18 01:21:25 +00:00
Ben 2cf59ced8b new pvp timer management, fixed build house task, fixed incognito 2016-03-18 01:18:35 +00:00
md_5 4899d56c09 Implement local gem boosters that can be activated on a joined arcade server. 2016-03-17 19:49:05 +11:00
Ben add651780b priority chat filters, fixed siege weapon clicking listeners being incorrect 2016-03-17 01:06:07 +00:00
Ben 93767b7a90 tutorial changes, chat filter system, commented out all web stuff for analytics. 2016-03-16 22:46:18 +00:00
Ben 0d237370e1 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-15 23:33:09 +00:00
Keir Nellyer 25075597f2 Only allow Ultra+ players to use /report whilst it's in beta testing. 2016-03-15 17:43:16 +00:00
Shaun Bennett e53b8616d1 A ton of tutorial work 2016-03-15 10:29:43 -05:00
Ben 813a3833ae implement temporary holograms 2016-03-15 00:48:50 +00:00
Ben e08ba29ac1 Final fixing of cannon saving/loading 2016-03-14 22:48:31 +00:00
Ben 422df69335 incognito async stuff and updated alpha holograms 2016-03-11 21:50:48 +00:00
Ben 86c50cc3cd updates 2016-03-11 19:03:32 +00:00
Shaun Bennett 1228ca227e Add support for 1.9 resource packs, Text Tutorials 2016-03-11 11:50:08 -06:00
Ben a27fb90c2a Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito 2016-03-11 02:21:03 +00:00
Ben 0e276474c5 fixerroooniissssss 2016-03-11 02:20:18 +00:00
Ben 01ba099d74 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito 2016-03-11 01:52:38 +00:00
Ben c9eb2c9559 Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito 2016-03-11 01:52:31 +00:00
Ben 57c65cf5ff some changes and vanish fixes maybe? 2016-03-11 01:47:14 +00:00
Ben a568db6d90 remove eclipse file 2016-03-11 00:43:30 +00:00
Ben bcfe4a42c0 changerooonis 2016-03-11 00:41:28 +00:00
Ben 33d978c6d6 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-10 22:12:41 +00:00
Ben 20ade492a8 tnt generator changes 2016-03-10 22:09:45 +00:00
Shaun Bennett 76782fd420 Fix issues 2016-03-10 15:07:22 -06:00
git 557b0bf978 Fix Wither disguise 2016-03-11 01:55:49 +13:00
Ben 5b3da3d06f Consistency. (Changed Vanish to Incognito) 2016-03-09 01:53:01 +00:00
Ben befb27d3db Finalized Vanish system 2016-03-09 01:45:17 +00:00
Virizion b1c8158e2f Added @a argument to /shard, /gem and /giveitem PC-13 2016-03-08 19:52:31 -05:00
Ben abdf61de0a *more fixes* 2016-03-08 21:02:25 +00:00
Ben af8f0fff16 vanish error fixes 2016-03-08 21:00:19 +00:00
Ben 69091c079f Merge branch 'feature/incognito' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-08 20:58:11 +00:00
Shaun Bennett 9b65926d42 Fix rank monthly rewards description 2016-03-08 13:26:26 -06:00
Ben 1f09616784 chat packet listener 2016-03-08 18:28:54 +00:00
Shaun Bennett 99c2fefed2 Merge remote-tracking branch 'remotes/origin/clans/tutorial' into clans/beta 
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
 2016-03-08 12:27:45 -06:00
Ben 86ef10456c packet hnadler beginning, switching to clans to fix errors 2016-03-08 18:10:57 +00:00
Ben f24e196efd Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito 2016-03-08 18:07:57 +00:00
Ben 036565abb7 more 2016-03-08 17:44:15 +00:00
Ben 0ff434cf91 progress 2016-03-08 16:49:32 +00:00
git 0f752fb7e3 Fix custom names in 1.9 2016-03-08 16:11:12 +13:00
git 280d03daa7 Fix names 2016-03-08 09:52:30 +13:00
git 496983ee04 Untested bugfixes 2016-03-07 22:29:14 +13:00
NewGarbo ae2da31544 Merge branch 'clans/alpha' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
 2016-03-05 23:14:32 +00:00
NewGarbo d92f817efc fixed some teleportation bugs and a bit of cleanup 2016-03-05 22:50:06 +00:00
git 6d0ca4f813 Merge branch 'Dual_1.9' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
 2016-03-03 13:49:31 +13:00
git 0ffa67dfb8 Ring game 2016-03-03 13:48:22 +13:00
NewGarbo 73d8870daf nether work (forgot to commit days ago oops) 2016-03-02 19:42:53 +00:00
Shaun Bennett 3447354814 Dual 1.9 Fixes 2016-03-02 12:58:30 -06:00
git 2a9d49ccd9 Merge branch 'master' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9 2016-02-25 18:11:12 +13:00
NewGarbo 2956b18821 some hologram work 2016-02-23 18:45:04 +00:00
Keir Nellyer 70260754ff Reset these files to their previous state (IDE added tabs). 2016-02-23 00:26:10 +00:00
Keir Nellyer c923745f5f Add required import. 2016-02-23 00:25:37 +00:00
Keir Nellyer 99150db2d7 Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/report/ReportRepository.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
 2016-02-22 19:02:54 +00:00
xGamingDudex 33b3d121b3 Merge branch 'develop' into project-cosmetics 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatLovestruck.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatSecretPackage.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCoalFumes.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleEnchant.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleFrostLord.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleGreen.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleHeart.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleHelix.java
 2016-02-20 15:30:26 +01:00
AlexTheCoder 3b7a7e457c Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla 2016-02-20 03:20:27 -05:00
Shaun Bennett 82d51a896f Add SERVER_STATS to DBPool. Rename STATS to MINEPLEX_STATS 2016-02-19 19:54:06 -06:00
NewGarbo 67c355bf65 remove more eclipse files 2016-02-19 07:22:54 +00:00
NewGarbo 441cf702c7 Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 2016-02-19 07:22:09 +00:00
NewGarbo d5583b93f2 remove eclipse files 2016-02-19 07:14:13 +00:00
Shaun Bennett 7714e4960c Use DBPool for everything 2016-02-19 00:17:38 -06:00
Shaun Bennett eab992e621 Delete SimpleStats 2016-02-18 23:01:23 -06:00
md_5 6d81e43b30 Don't print db config to System.out 2016-02-19 15:30:30 +11:00
NewGarbo 8507bb1bd8 all progress over this week 2016-02-18 21:29:42 +00:00
libraryaddict 8b1b63c8b3 Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into Dual_1.9 
Conflicts:
	Patches/craftbukkit.jar
 2016-02-18 16:45:37 +13:00
AlexTheCoder 9e2840b3b5 Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla 2016-02-16 21:28:07 -05:00
xGamingDudex 10e89a228e Added some extra checks to Blood 
Should resolve possible NPE and Material.AIR issues along
 2016-02-16 18:48:27 +01:00
md_5 8893db60d7 Fix highly annoying exception in Reindeer mount. 2016-02-16 12:46:39 +11:00
AlexTheCoder 53ac1827bc Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla 2016-02-15 19:13:20 -05:00
Shaun Bennett 95c22a59fd Use DNS for chat filter 2016-02-15 16:30:57 -06:00
Shaun Bennett 15ed2570e2 Valentines final changes, Change Gift Giver achievement 2016-02-15 20:43:46 -06:00
xGamingDudex 85b8937801 Hats, supposed to go in the previous one 2016-02-15 16:39:04 +01:00
xGamingDudex 7d8ffa1311 Small stuff 2016-02-15 16:38:18 +01:00
NewGarbo e25accfba4 outpost saving and loadi9ng 2016-02-15 11:24:29 +00:00
AlexTheCoder f6c38903f2 Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla 2016-02-13 14:34:11 -05:00
AlexTheCoder ea893bfa48 - Fixed update 2016-02-12 23:03:38 -05:00
AlexTheCoder 197bcc9dbf Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java
 2016-02-12 21:23:58 -05:00
NewGarbo e6eb43ada8 PUSHING CODE BECAUSE MY HDD MIGHT BE BREAKING DOWN. THIS CODE IS UNTESTED PROBABLY DOESN'T WORK 2016-02-12 19:58:40 +00:00
Shaun Bennett 0d19a8017f Update Featured arcade game, various bug fixes 2016-02-12 06:51:30 -06:00
Shaun Bennett 1e596a6969 Valentines rewards 2016-02-12 04:54:09 -06:00
Shaun Bennett 66aa89b5e0 Fix sheep look bug, valentines gift effects, valentines achievements 2016-02-12 04:32:26 -06:00
Shaun Bennett dfd61833b7 Valentines changes 2016-02-12 03:03:47 -06:00
Shaun Bennett d8965179f7 More valentines adjustments/fix gladiators tutorial being enabled 2016-02-11 23:01:59 -06:00
Shaun Bennett 2eeddb828b Merge pull request #165 in MIN/mineplex from virizion_speed_builder to develop 
* commit '51d152d48473f820ab6d03586fb41f890750f645':
  Perfect build all fix
  Only eliminated players are guardians. Broken blocks/mobs go directly into inventory.
  Stop mid game joiners from getting participation gems.
  Mob egg baby fix. Also fixed non build entities from being "broken"
  spec command add guardian
  The infamous look direction bounce bug
  Chiss' double jump mechanic
  Moar fixes
  Hopper item pickup fix.
 2016-02-11 22:59:35 -06:00
Cheese eebe25040e cleaned the particle effects a bit 2016-02-10 16:31:25 +11:00
Shaun Bennett e3ff25526b Merge pull request #164 in MIN/mineplex from valentines/game to develop 
* commit '6800e4ef478e2d1eea5c19ec52a8368ec0bd520a':
  valentines final push
  bug fixes
  more valentines :)
  many valentine, such wow
  val1
 2016-02-09 20:28:58 -06:00
Shaun Bennett f6e091f029 Merge pull request #163 in MIN/mineplex from feature/valentines-cosmetics to develop 
* commit '57638ff68496b6f10012f8782633066b52a8a715':
  More work on valentines
  Valentines gifts
  Added love potion and hub sheep thing.
  Started on Love Potion system. Switching branches.
  Varius tweaks and changes.
  Added sheep mount to index.
  Added various cosmetic items for Valentines day.
 2016-02-09 20:28:37 -06:00
Shaun Bennett 57638ff684 More work on valentines 2016-02-09 16:26:17 -06:00
Shaun Bennett a868b8b2b8 Valentines gifts 2016-02-08 22:26:33 -06:00
xGamingDudex c4da8ef636 Cosmetic Update 
+ Set Storm
+ Set Shadow
+ Set Music
+ Set Emerald
+ Set Blood
+ Set Enchant

+ Particle Ying and Yang
+ Particle Wings Angel
+ Particle Wings Infernal
+ Particle Wings Pixie

+ Shape Utils

* Particle Party Time
* Particle Heart
* Double Jump Firecracker
 2016-02-08 00:21:47 +01:00
Virizion 008fc587b0 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2016-02-07 15:33:37 -05:00
Shaun Bennett c059425e9d Remove GiveawayManager (not used anymore) 2016-02-07 13:18:29 -06:00
Shaun Bennett f502c2a693 Fix filtermessage sync calls 2016-02-07 12:15:08 -06:00
Mysticate a8ff714ee4 Added love potion and hub sheep thing. 2016-02-07 10:19:40 -05:00
Mysticate c1393697f8 Started on Love Potion system. Switching branches. 2016-02-06 14:08:17 -05:00
Mysticate b414642990 Varius tweaks and changes. 2016-02-04 21:58:55 -05:00
Virizion a76e570b8a Moar fixes 2016-02-04 21:43:17 -05:00
Mysticate e94222a68e Added sheep mount to index. 2016-02-04 13:13:22 -05:00
Mysticate c0d6cbbb85 Added various cosmetic items for Valentines day. 
- Heart arrow trail
- Heart death animation
- Heart double jump animation
- Heart set
- Cupid's bow gadget
- Pink Sheep mount
 2016-02-04 13:12:53 -05:00
Cheese 5c22c841fe val1 2016-02-04 10:55:29 +11:00
Keir Nellyer 27fc81dd8b Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report 2016-02-03 17:23:40 +00:00
Keir Nellyer a8f9c91534 ReportServer: update package name and configure Maven to generate a META-INF file with the main class name included. 2016-02-02 22:28:18 +00:00
Shaun Bennett 86917fb146 Fix treasure stair orientation 2016-02-02 05:50:03 -05:00
Shaun Bennett af27944a39 add a shard queue to DonationManager, use that for TreasureShardReward 2016-02-02 05:34:33 -05:00
Shaun Bennett 1a9c36d0a1 Merge pull request #153 in MIN/mineplex from master to bugfix/duplicates 
* commit '3a945f190dca9f558cbcb6052b3eaa2816d112b3': (308 commits)
  Commons codec is not included in BungeeCord.
  Pooling with later jedis versions doesn't work on Bungee.
  Gitignore redundant Eclipse files.
  Add Eclipse magic.
  Speed up LobbyBalancer to 500ms
  Add example maven settings.xml
  Remove setTestOnBorrow
  Tone down lobby balancer too.
  Emergency patch to slow down redis player count updates.
  Fixed explosions dropping right items.
  sapling fix
  Update fixes - @Teddy!
  Made block define its own drops.
  Removed an nunnecesarry method
  Fixed items not dropping their regular counterpart.
  Final changes
  Prep for update
  Update CB.jar
  Prevent hearts changing colors in UHC tab.
  Fixed ForTheKing achievement.
  ...
 2016-02-01 15:49:34 -06:00
Keir Nellyer 9601eabfeb Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report 
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
 2016-01-31 17:38:08 +00:00
NewGarbo cc857da88e Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
 2016-01-31 16:27:14 +00:00
NewGarbo 002be01ef1 MAVEN TEST COMMIT 2016-01-31 16:21:04 +00:00
Shaun Bennett c23855bd65 Merge with develop 2016-01-30 02:44:24 -05:00
md_5 7ed0ab442f Emergency patch to slow down redis player count updates. 2016-01-30 12:36:20 +11:00
Keir Nellyer 8cf32ef8bf Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report 2016-01-30 00:46:43 +00:00
Shaun Bennett 1c3c800a66 Update fixes - @Teddy! 2016-01-29 14:05:09 -05:00
Shaun Bennett 50fc1f5a10 merge with develop 2016-01-29 03:44:04 -05:00
Shaun Bennett a1f9f41910 Merge remote-tracking branch 'origin/develop' into develop 2016-01-29 03:37:03 -05:00
Shaun Bennett 2e2a08bea8 Merge pull request #142 in MIN/mineplex from bugfix/coal-particles to develop 
* commit 'd1d3382ec065bb7c508044d53124266fda142c00':
  Prevented Coal particles from showing during the game
 2016-01-29 02:33:57 -06:00
Mysticate d1d3382ec0 Prevented Coal particles from showing during the game 2016-01-28 22:44:33 -05:00
Shaun Bennett 60ee5d1da0 Move disable custom inside of IsActive check 2016-01-28 22:33:48 -05:00
Shaun Bennett 40f6969413 Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2016-01-28 22:16:15 -05:00
Shaun Bennett 051d70771b Facebook Command 2016-01-28 22:15:35 -05:00
Shaun Bennett f72ee95759 Merge pull request #139 in MIN/mineplex from virizion_speed_builder to develop 
* commit 'b6db99806ab171774ffd9c9db11cf361ad76dc94': (83 commits)
  Remove debug message.
  Fix flickering judge laser.
  Borders for spec are fixed.
  Leaves fix.
  Fix dupe scoreboard entries. Make it so perfect builders can't fill or empty bucket.
  Make dependable require 50 perfect builds instead of 10.
  Multiply by less
  negative!
  Trying different hologram location
  Fix messages, fix /stats
  Center hologram
  Make achievement category classics
  hologram changes
  Holograms maybe?
  Chiss' checklist.
  Remove unnecessary tabs. Make the judge guardian use it's own laser again.
  Fixed builds with only mobs not loading.
  Fixed mobs.
  TICK TICK TICK TICK.
  all players equal, no one loses
  ...
 2016-01-28 21:02:23 -06:00
NewGarbo a0cc0b7ec9 Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/Gameplay.java
 2016-01-28 13:28:00 +00:00
NewGarbo b5f04011e5 fixed chatslow not working + filter not working for players not in clan 2016-01-28 13:24:30 +00:00
Keir Nellyer ac37417fca Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report 
# Conflicts:
#	Plugins/.idea/modules.xml
 2016-01-27 21:44:04 +00:00
Virizion a1eec79b3b Make dependable require 50 perfect builds instead of 10. 2016-01-25 16:43:43 -05:00
Shaun Bennett 616be8aea7 Fix messages, fix /stats 2016-01-25 03:59:37 -06:00
Virizion 2dcc356aab Make achievement category classics 2016-01-25 04:33:25 -05:00
NewGarbo 33845cbc72 Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta 2016-01-25 08:48:13 +00:00
NewGarbo 5b32911a42 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 2016-01-25 08:46:26 +00:00
NewGarbo 0252436990 cannons updates 2016-01-24 20:56:47 +00:00
Shaun Bennett 650d586e0f Add perfect build count to stats 2016-01-23 02:49:08 -05:00
Shaun Bennett 231b8cb19a Merge pull request #133 in MIN/mineplex from bugfix/foo to develop 
* commit '376f719c261bd2152a6646a152472a2485e1b689':
  fixes important bug, fixed a scary typo!
  Lots of typo fixes and such
  i before e!
  fixed cosmetic menu item dropping bug
  more grammatical errors hast been fixed
  Grammatical errors hath been fixed!
 2016-01-22 18:38:26 -06:00
Shaun Bennett ddc86f0897 Add Speediest Builderizer achievement 2016-01-22 19:13:23 -05:00
Virizion 5c83f5c1e5 Renamed to Speed Builders from Speed Builder. 2016-01-22 00:20:58 -05:00
Virizion 69825893c9 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2016-01-21 19:11:36 -05:00
Virizion 6ab6307f74 Pushing all my stuff for Shaunpai. 2016-01-21 19:08:38 -05:00
Shaun Bennett 877ec4710e Removing duplicate NCP hooks 2016-01-21 17:22:10 -05:00
Shaun Bennett 3803a3d82e Add player heads back to friends lsit 2016-01-21 17:19:51 -05:00
Shaun Bennett 0fd5540de6 Merge pull request #132 in MIN/mineplex from bugfix/give-item-offline to develop 
* commit '404e049c31df6d4278ee3ed46e7f0b8e2f92ee16':
  Give item fix for offline players
 2016-01-21 15:44:34 -06:00
Shaun Bennett a41816ca22 Include version.properties in Mineplex.Core 2016-01-21 16:37:35 -05:00
Shaun Bennett a0f39bf36e Merge remote-tracking branch 'origin/develop' into develop 2016-01-21 16:31:52 -05:00
Shaun Bennett 64ec092d09 Rename coin command to shard command 2016-01-21 09:10:39 -05:00
Keir Nellyer dd0fc23467 Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report 2016-01-21 10:12:02 +00:00
md_5 447583624e Fix ascii.png duplication. 2016-01-21 17:47:21 +11:00
Shaun Bennett 359655f417 Merge pull request #131 in MIN/mineplex from md_5/suspicious to develop 
* commit '4927bb8c0b6b1fcebe41adf9f38489fe82116cfa':
  Fix some misc suspicious calls to Collection methods.
 2016-01-20 12:23:55 -06:00