Commit Graph

3393 Commits

Author SHA1 Message Date
Keir Nellyer 4ed51b5747 Fix getProfiles and getReports methods 2016-07-14 21:01:49 +01:00
Keir Nellyer 65e8b92c1a Small refactorings (class relocations and renames) 2016-07-14 20:15:14 +01:00
Keir Nellyer 15b5198dbb Ensure words are fully capitalised
Previously only the first word was capitalised.
2016-07-14 19:25:53 +01:00
Keir Nellyer 7f48151c8c Made handler messages slightly more prettier 2016-07-14 19:19:16 +01:00
cnr a0847b8d1a Fix null ServerGroup uptimes value for MPSes 2016-07-14 08:08:24 -05:00
cnr 4d0903dba7 Fix compile error 2016-07-14 03:11:59 -05:00
Shaun Bennett e28320b361 Fix disableCustom not firing properly 2016-07-14 02:47:49 -05:00
cnr 917b83250d Revert "Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing"
This reverts commit 30287a0832, reversing
changes made to b8650d741d.
2016-07-14 00:10:37 -05:00
samczsun 7dcf7378ef Many changes
Fix spectator race condition
Refactor out cut clean into modules
Add combat log module
Add antixray module
2016-07-13 21:30:54 -05:00
cnr a7b30f4f59 Merge branch 'thanos-mineware' into develop 2016-07-13 21:26:25 -05:00
cnr 4343fa3512 Merge branch 'project-cosmetics' into develop 2016-07-13 21:22:41 -05:00
LCastr0 6af04b5438 Fixes for winroom gadget disable messages 2016-07-13 18:21:08 -03:00
Shaun Bennett 369dabffae Amplifier updates - move to boost shards only 2016-07-13 15:07:24 -05:00
Thanos Paravantis 711a04ffa8 Add Bawk Bawk Battles to hub compass 2016-07-13 21:40:31 +03:00
AlexTheCoder 9c3aee6373 Convert all possible gem vote rewards to treasure shard vote rewards to comply with Mojang EULA 2016-07-13 11:17:24 -05:00
cnr 7df228a8fa Move WinEffectGadget schematics to update folder 2016-07-13 06:36:42 -05:00
Thanos Paravantis 179b59af2c Merge branch 'develop' into thanos-mineware 2016-07-13 13:28:03 +03:00
cnr e40abd4859 Merge branch 'thanos-mineware' into develop 2016-07-13 05:04:50 -05:00
cnr 85db0ad613 Remove global rawr 2016-07-12 15:51:47 -05:00
xXVevzZXx 654ab281ea Add option of "uptimes" to servergroups 2016-07-12 15:44:29 -05:00
Thanos Paravantis 0f3b2da8b7 Fix Bouncing Block, re-add features for testing 2016-07-12 23:02:01 +03:00
cnr daddaa477e Merge branch 'update/brawl-games' into develop 2016-07-12 06:45:32 -05:00
xXVevzZXx ac8a920484 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/brawl-games
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/GunModule.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Gun.java
2016-07-12 03:07:31 +02:00
AlexTheCoder d3270b9289 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-07-11 14:50:16 -04:00
AlexTheCoder 30287a0832 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing 2016-07-11 14:46:08 -04:00
Sam f40299e402 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-07-11 18:34:48 +01:00
AlexTheCoder 0be317e5be Implement tweaks and finalize implementations for bosses and fix loot dropping bugs 2016-07-11 11:36:48 -04:00
Thanos Paravantis 6a87be13f0 Remove features that contain bugs 2016-07-11 01:02:19 +03:00
Keir Nellyer e1adf7d4e2 JavaDocs 2016-07-10 13:32:20 -04:00
Keir Nellyer b808121d68 Make ReportResult and ReportMessage timezone friendly.
This switches all if not most of the report feature code to using the
 new Java 8 date time API since it is much better for handling
 timezone's.

 This commit also creates a few new methods in UtilTime as they are
 used throughout the "report" and "chatsnap" packages. They may also
 come in useful for other developers using timezones.
2016-07-09 23:41:39 -04:00
Keir Nellyer 3f8eaf0da7 Missing semi-colon 2016-07-09 22:56:32 -04:00
Keir Nellyer edf63dcafd Print exceptions for everything!!! 2016-07-09 18:09:26 -04:00
Keir Nellyer ac95a59f81 Mark reports as expired when an expired report is detected
Also wrote JavaDocs for expireReport and saveReport methods.
2016-07-09 15:47:31 -04:00
Keir Nellyer d7736e9e02 Wait until report data has been saved to the database, otherwise the
message task will not function until it's second iteration
2016-07-09 15:32:46 -04:00
Keir Nellyer 400a6adab2 Show message when report has been closed
Also run Bukkit API methods synchronously.
2016-07-09 15:24:41 -04:00
Keir Nellyer e26ced1438 First report handler detail message should be instant 2016-07-09 14:59:27 -04:00
Keir Nellyer 5c6cac2849 Remove debug line 2016-07-09 14:57:55 -04:00
Keir Nellyer c909cd4733 A report is active if it is being handled but has not yet been closed 2016-07-09 14:55:42 -04:00
Keir Nellyer 6a78556fda Ninja fix for previous commit 2016-07-09 14:49:00 -04:00
Keir Nellyer aadb3df715 A report is no longer active if a result for it has been set 2016-07-09 14:48:26 -04:00
Keir Nellyer 29b1110f6b Access to SnapshotsManager inside ReportManager is no longer required 2016-07-09 14:40:17 -04:00
Keir Nellyer 1eb3fb4aa3 Modify GET_REPORTS_HANDLING query to ignore closed reports 2016-07-09 14:38:12 -04:00
Keir Nellyer c98c352546 Prevent reputation from being 0, this causes all reports the player
opens to be instantly closed
2016-07-09 14:37:23 -04:00
Keir Nellyer 87df6804c9 Improve code and error logging 2016-07-09 14:36:30 -04:00
Keir Nellyer 0783f3b693 Fix sql error when a report is closed due to expiration 2016-07-09 11:31:51 -04:00
Keir Nellyer abea5bbf81 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-07-08 23:27:07 -04:00
Keir Nellyer 5c83f09456 SnapshotRepository no longer extends MinecraftRepository
It doesn't need to.
2016-07-08 23:26:33 -04:00
Keir Nellyer d9288277d5 Push chat snapshots from all servers
This fixes an issue whereby the handler would not be able to see chat
 snapshots unless they begin the handling process whilst connected to
  the same server as the offender.
2016-07-08 23:22:55 -04:00
Timothy Andis 2cac4c9c66 Remove toLowerCase owner method 2016-07-08 16:17:48 -05:00
Keir Nellyer a0d046ab8b Optimize getting of ReportProfile's from database 2016-07-08 17:14:41 -04:00
TadahTech cbb0fa37fb Lang tweaks. 2016-07-08 15:32:25 -05:00
cnr 5b98bfddce Update YouTube link to landing + sub confirmation 2016-07-08 15:20:50 -05:00
Thanos Paravantis 331c1bcf91 Merge branch 'develop' into thanos-mineware 2016-07-08 22:29:59 +03:00
TadahTech 1313db4071 Commit lost file. 2016-07-08 14:06:16 -05:00
TadahTech ce72d25832 Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 2016-07-08 13:09:02 -05:00
TadahTech 8c7308add5 Add documentation.
Refactor code.
Remove most command backend capabilities to limit user error.
Cleanup.
2016-07-08 13:08:34 -05:00
xGamingDudex 5349d26115 Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into feature/mavericks-master-builders 2016-07-08 03:41:13 +02:00
Keir Nellyer 1ce1c796f4 Repository classes no longer need to extend MinecraftRepository 2016-07-07 21:12:08 -04:00
Keir Nellyer b9f1dcbcd5 Make method `getReportPrefix(Report)` simpler 2016-07-07 21:05:41 -04:00
Keir Nellyer 8d2916c23e Create JavaDoc's for all methods in ReportManager 2016-07-07 21:04:16 -04:00
xGamingDudex c50ec49ad9 Minor updates
Tweaked some location values.
Added more event handling to the reveiw hub and mavericks hub.
Added builder info holograms to all sides of the display slots in the
mavericks hub.
2016-07-08 02:59:33 +02:00
Keir Nellyer cb555a41ab Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-07-07 20:47:19 -04:00
Keir Nellyer 0dc17bf6fa Further code cleanup 2016-07-07 18:12:52 -04:00
Keir Nellyer 58df3022a5 Completely remove old staff notifications system 2016-07-07 18:08:19 -04:00
Sam da9ad913b2 Finalisation of update 2016-07-07 23:03:23 +01:00
Keir Nellyer bc2b7884ee Make this code a lot smarter 2016-07-07 17:57:19 -04:00
Keir Nellyer 4361379eaa Close expired reports when they are detected
This improves performance and allows for easier database maintenance.
2016-07-07 15:35:47 -04:00
Keir Nellyer 77a98bc250 Remove spammy and useless report notifications 2016-07-07 13:58:09 -04:00
Keir Nellyer fa02b18ffb These shouldn't be batched as there will only ever be a single query 2016-07-07 13:28:08 -04:00
Keir Nellyer 175c3523f8 Remove todo relating to removal of database cleanup of chat entries
after a report has been closed

An external cleanup job/script will be used to remove old data
2016-07-07 13:19:42 -04:00
cnr 443576ba1a Update YouTube link and send shard reward message 2016-07-06 20:15:41 -05:00
samczsun 63b6158fe4 More UHC Fixes
Fixes:
PC-137
PC-138
PC-497
PC-665
PC-710
PC-719
PC-754
Also fixes chunk synchronization issue, plugs potential memory leaks

Fancy spectating

Use enum priorities
2016-07-06 15:55:12 -04:00
Shaun Bennett 8cf470cfd0 Update fountain goals 2016-07-06 13:39:56 -05:00
cnr 17f89f6937 Merge branch 'project-cosmetics' into develop 2016-07-06 13:00:29 -05:00
LCastr0 63500c19c9 Removed commented lines
Added javadocs to GadgetChangeEvent
2016-07-06 14:45:05 -03:00
Thanos Paravantis 185ba600ca Merge branch 'develop' into thanos-mineware 2016-07-06 17:48:31 +03:00
LCastr0 67adb34311 Fixes for the WinRooms
Removed Freedom Chests from the menu
2016-07-06 00:00:50 -03:00
AlexTheCoder eccd7deedc Fix merge errors and properly force disable particles by checking the game's settings 2016-07-05 17:25:01 -04:00
Thanos Paravantis 0eab6db116 Soccer bug fixes and minor improvements
- Slimeball will no longer be able to get stacked.
- Players in soccer mode will not able to stack others.
- Guardian lazer can no longer be used in the soccer field.
- Players in soccer won't get knockback, except if they double jump.
2016-07-05 15:39:10 -05:00
Keir Nellyer 67213ec696 Tie all these together 2016-07-05 16:14:30 -04:00
TadahTech 9f58e57a67 Bug fixes. 2016-07-05 14:35:37 -05:00
TadahTech 978ee0055a Bug fixes. 2016-07-04 09:15:47 -05:00
TadahTech 0ebddf9f45 Add UI Item.
Add check to make sure player's cant be invited to another party if they're already in one.
Bug fixes.
2016-07-04 05:43:01 -05:00
TadahTech 584c8f50f0 PC Party bugs and tweaks. 2016-07-04 05:12:02 -05:00
TadahTech 06feb615a9 Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 2016-07-04 04:18:01 -05:00
AlexTheCoder af9d91faa8 Further prevent nullpointer errors 2016-07-03 04:11:14 -04:00
AlexTheCoder ffdc7b4be0 Temporarily patch random nullpointer 2016-07-02 18:05:26 -04:00
AlexTheCoder 9898b3d95d Fix block state not saving on restore (Untested) (PC-610) 2016-07-02 18:02:59 -04:00
samczsun 54cda56c11 Initial Commit 2016-07-02 17:16:42 -04:00
LCastr0 050ae75e49 Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-07-02 13:33:33 -03:00
LCastr0 7a6335a021 Fixes for win rooms? Or not yet?! 2016-07-02 13:32:35 -03:00
AlexTheCoder e4c94f5421 Fix whitelist for Customer Support servers 2016-07-02 01:32:42 -05:00
xGamingDudex 6d9e84b817 Merge branch 'develop' of
ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into
feature/mavericks-master-builders

Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/F.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/BuildData.java
2016-06-30 23:08:31 +02:00
xGamingDudex 32ee27d9ee Small bugfixes with QA
Never re-show reviewed builds in review-server.
Toggle debug messages in review-server.
Fixed minor bugs with QA
2016-06-29 03:49:53 +02:00
LCastr0 24186d9992 More fixes for gadget persistence 2016-06-28 18:11:00 -03:00
Thanos Paravantis c5c08562c3 Merge branch 'master' into thanos-mineware 2016-06-28 23:01:42 +03:00
xGamingDudex 8ad63ef7ea Tweaked some code to better fitt schematics. 2016-06-28 06:29:44 +02:00
Keir Nellyer 561734e7fe Remove unused imports (accidentally added) 2016-06-27 21:18:40 -04:00
xGamingDudex a69101bef3 Cleaned out some debug messages and added some java-docs. 2016-06-28 01:35:37 +02:00
AlexTheCoder ab315627ad Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game 2016-06-27 17:45:36 -04:00
Keir Nellyer 48a2d0d304 Remove old completed todo 2016-06-27 18:06:01 +01:00
Keir Nellyer 42bd2148e5 Don't allow a user to handle more than one report simultaneously 2016-06-27 17:56:01 +01:00
xGamingDudex d6672c44f4 Finalized the hub module and finished local testing
Cleaned up some source. Applied some small updates. Finished local
testing.
2016-06-27 00:34:17 +02:00
Keir Nellyer 90df695624 Merge branches 'feature/report-v2' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-06-26 00:18:07 +01:00
LCastr0 30f413d04e Fixes for persistence:
No longer save items after they are disabled
No longer keep the particle effect after a staff vanishes
2016-06-25 02:22:20 -03:00
TadahTech 50759661cf Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 2016-06-24 23:52:27 -05:00
LCastr0 d75abe3aea Persistence fixes 2016-06-25 00:36:00 -03:00
LCastr0 83f4b25887 Testing persistence fixes 2016-06-25 00:33:36 -03:00
cnr c430566c6d Never reset a player's YouTube click time locally 2016-06-24 16:59:27 -05:00
Shaun Bennett 94fe9f57d2 Add missing imports 2016-06-24 12:36:56 -07:00
Kenny Goodin dc9145c707 Hotfix, disable youtube and twitter buttons in BonusGUI 2016-06-24 15:33:07 -04:00
Keir Nellyer 323d865b57 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
# Conflicts:
#	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-06-24 18:13:51 +01:00
Keir Nellyer c5319dbe1d Switch identifier system for id system (no need for tokens any more) 2016-06-24 18:08:47 +01:00
Keir Nellyer 52873d5618 Do away with tokens 2016-06-24 17:59:26 +01:00
Keir Nellyer 45418b3a4d Add todo 2016-06-24 17:56:01 +01:00
Keir Nellyer daae2f7a3a Shorten method name 2016-06-24 17:54:54 +01:00
Keir Nellyer 871bb04451 Fix /reporthandle command 2016-06-24 17:45:56 +01:00
Keir Nellyer d178e9112b Temporarily base priority on report age 2016-06-24 15:39:48 +01:00
Keir Nellyer fd64753ba0 New /reporthandle command 2016-06-24 12:14:58 +01:00
TadahTech 8fbb06ae3d Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
# Conflicts:
#	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2016-06-24 04:11:38 -05:00
TadahTech e71fc291d1 Fix cross server invites / joining servers. 2016-06-24 04:01:51 -05:00
Shaun Bennett b4caf5125b Adjust tip amounts 2016-06-24 03:16:42 -05:00
Shaun Bennett d708c478d7 Dont display other boosters, fix typo 2016-06-24 03:16:42 -05:00
Shaun Bennett 348cb9efba Fix remaining booster message 2016-06-24 02:23:09 -05:00
cnr b58ff8c066 Add YouTube and Twitter buttons to UI 2016-06-24 01:30:10 -05:00
Shaun Bennett def57e2c0b Fix HubManager, add failsafe for BoosterManager 2016-06-23 23:19:02 -07:00
Shaun Bennett fd843b88cb Merge remote-tracking branch 'remotes/origin/develop' into feature/boosters-final
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/inventory/GemBooster.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
#	Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java
2016-06-23 23:02:26 -07:00
Shaun Bennett a9f291338f Amplifiers GM Candidate 2016-06-23 22:49:12 -07:00
TadahTech c204562eb3 Fix cross server invites / joining servers. 2016-06-23 23:25:26 -05:00
TadahTech ce1aab5e11 Fixes and changes 2016-06-23 21:53:12 -05:00
cnr 3433e0e3bc Merge branch 'project-cosmetics' into develop 2016-06-23 18:42:47 -05:00
Keir Nellyer d67082bca2 Ran a code inspection and implemented some suggested changes 2016-06-23 23:31:51 +01:00
xXVevzZXx dc57f7b4e6 add testrank command for SR.Mods 2016-06-23 22:05:26 +02:00
Keir Nellyer 7f75a7ff50 Unfortunately we can't batch these SQL commands as we have to retrieve the snapshot id after inserting 2016-06-23 20:36:34 +01:00
LCastr0 c1b7be6363 Fix merge problems 2016-06-23 16:33:20 -03:00
LCastr0 7749314e64 Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-06-23 16:11:49 -03:00
LCastr0 a441727e09 Freedom update:
Freedom chests
Freedom Aura
Shock and Awe
Leap of Freedom
Price of Freedom
Uncle Sam Morph
Freedom Mount
Uncle Sam Hat
Persistence update:
Items will still be enabled after player leaves the server
2016-06-23 16:09:31 -03:00
Keir Nellyer e6989cd8da Output errors caused by inserting snapshots into database 2016-06-23 20:06:16 +01:00
Keir Nellyer 4606f27408 Switch report ids to use data type 'long'
This is because in the database we store them as an unsigned integer, which means the Java integer type will not be able to hold values after a certain point.
2016-06-23 14:11:58 +01:00
TadahTech 33cce620be Update UI and fix typos 2016-06-23 03:11:45 -05:00
TadahTech df53021f7c Fix Party Redis. Improve Party UI. General testing and fixing. (Funny enough, again. 2016-06-23 02:56:42 -05:00
TadahTech fb6a772eb0 Fix Party Redis. Improve Party UI. General testing and fixing. 2016-06-23 02:39:05 -05:00
Shaun Bennett 6e2c751be1 Adjust amplifiers queue message 2016-06-22 21:09:09 -07:00
Shaun Bennett 0873efd876 Update more lore text 2016-06-22 20:54:29 -07:00
Shaun Bennett 621d72f541 Fix merge issues, update lore text 2016-06-22 20:51:58 -07:00
Shaun Bennett 249a5c70aa Merge remote-tracking branch 'remotes/origin/develop' into feature/boosters-final
# Conflicts:
#	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-06-22 20:35:40 -07:00
Shaun Bennett 906e0e0044 Allow API error messages from HTTP 503 2016-06-22 20:31:18 -07:00
Keir Nellyer addbd4dd88 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-06-23 01:21:12 +01:00
Keir Nellyer 4fc5e036fa Remove old redundant chat cache command
Fix broken code in SnapshotPlugin
2016-06-23 01:13:18 +01:00
Keir Nellyer 8bbeb3292f Removed old code resulting in compiler error and replaced with a todo for the future 2016-06-23 01:03:25 +01:00
Keir Nellyer 2931826916 Improve readability by separating these functions out 2016-06-23 01:01:20 +01:00
Keir Nellyer 352ecc6ad6 Improve database performance by executing queries in batch 2016-06-23 00:57:41 +01:00
Keir Nellyer 09a74e3772 Work on pushing chat snapshots to db 2016-06-23 00:38:24 +01:00
Alex-The-Coder 2453f82061 Rename Filterbutton.java to FilterButton.java 2016-06-22 18:40:12 -04:00
TadahTech 50534c3af9 UI And server manager changes 2016-06-22 17:28:43 -05:00
Shaun Bennett e855a866c7 Fix more thanks and booster occurrences 2016-06-22 08:58:27 -07:00
xGamingDudex 318c137aba Moved mavericks repository resources to core, merging review and game 2016-06-22 17:08:34 +02:00
TadahTech e53b474f3f Fix typo. 2016-06-22 00:59:22 -05:00
TadahTech 38a13d01f1 Open server menu properly 2016-06-22 00:56:44 -05:00
TadahTech 4d31867e98 PC Party updates. 2016-06-22 00:35:57 -05:00
Keir Nellyer ef0c3721d8 Micro-optimisation since this ArrayList will only ever hold a maximum of 2 items 2016-06-21 17:47:44 +01:00
Keir Nellyer b46f08938e Implement age decay algorithm as supplied by @alexthecoder 2016-06-21 17:46:52 +01:00
TadahTech e39326b592 Help Command UI. 2016-06-21 00:11:33 -05:00
TadahTech b75e87753d Party UI work. 2016-06-20 22:45:53 -05:00
TadahTech a49e815765 Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 2016-06-20 16:40:33 -05:00
TadahTech 2211cf4dec Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-06-20 16:37:07 -05:00
Shaun Bennett 1c1912b92a Update fountain goals again 2016-06-20 00:52:33 -05:00
Shaun Bennett afc636b7c5 Fix amplifier reward message 2016-06-19 20:16:33 -05:00
Shaun Bennett bb8d94f38a Fix a lot more Booster cases 2016-06-19 19:48:17 -05:00
Shaun Bennett 63b7648608 Amplifier rename, move podium backwards 2016-06-19 19:05:04 -05:00
Keir Nellyer b4f10531cb Merge branch 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-06-19 22:46:19 +01:00
Keir Nellyer 2cfb84eece Shorten some code 2016-06-19 22:46:06 +01:00
Keir Nellyer ec2ec878e8 Message type id mapping in preparation for storing chat messages in database 2016-06-19 22:28:56 +01:00
Shaun Bennett 38058bc670 Confirmation Paging 2016-06-19 05:49:32 -05:00
Shaun Bennett 2f0a559441 Add reload command, change podium to lime dye, change tip message 2016-06-18 14:41:32 -05:00
Keir Nellyer f34c65111b Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-06-18 00:48:00 +01:00
Shaun Bennett 5f9a57b7e2 Lower booster tip cooldown to 1 minute 2016-06-17 16:10:01 -05:00
Shaun Bennett 4e3062f413 Swap Cosmetic and Booster interface slot 2016-06-17 15:23:53 -05:00
Shaun Bennett 0873ee0116 Show entire booster queue in booster gui 2016-06-16 16:54:54 -05:00
samczsun 1893e98036
Don't run chat filtering on the main thread 2016-06-16 16:39:43 -04:00
TadahTech 5ac6249684 Fix Bridges Kits not getting their items.
Fix Kits breaking at Level 5
2016-06-16 15:34:23 -05:00
Shaun Bennett ea551182b6 Make booster gui smaller 2016-06-16 15:29:05 -05:00
TadahTech e7d76e2ef4 Hot fixes. 2016-06-16 03:56:32 -05:00
samczsun 1e5d91e392
Make porting from old legendaries work, fix null commandcenter 2016-06-15 21:52:25 -04:00
Shaun Bennett cbfbd6fe1c Booster GUI update 2016-06-15 17:40:20 -05:00
TadahTech 27afd3d96c Kit progression update 2016-06-15 15:54:53 -05:00
Shaun Bennett aa785ed3d5 Code clean-up and documentation 2016-06-12 21:18:11 -05:00
TadahTech 22e22ff508 Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/party/Party.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-06-12 00:42:22 -05:00
Keir Nellyer 6bc8039dbd Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-06-11 14:04:43 +01:00
Keir Nellyer ed50e09a6e Fix issue an old un-closed but expired report may be re-opened and cause issues 2016-06-11 13:59:53 +01:00
Keir Nellyer 197acee4ae Implement server weighting 2016-06-11 13:47:45 +01:00
Shaun Bennett cf87469400 Fix a possible NPE, use proper IP and port for api 2016-06-10 20:24:22 -05:00
Shaun Bennett 2421fd1cfe Update booster page, proper booster rewards 2016-06-10 19:40:27 -05:00
Shaun Bennett 42c35063b3 Display all the boosters you have activated 2016-06-10 17:40:59 -05:00
Shaun Bennett 6964b1f266 Booster gui command 2016-06-10 17:20:23 -05:00
Shaun Bennett e6920b4549 Work on booster gui, display wait time 2016-06-10 17:17:43 -05:00
Shaun Bennett ceb4de8b35 Load booster groups for arcade 2016-06-10 16:33:53 -05:00
Thanos Paravantis 6d380c6c6f Rename building champion to Speedy Builders 2016-06-10 22:44:13 +03:00
Shaun Bennett 0a204a3b90 Use redis pub/sub to send booster updates 2016-06-10 12:44:27 -05:00
Keir Nellyer a73e1c24b5 Properly calculate user reputation 2016-06-10 15:47:59 +01:00
Keir Nellyer 380139477c Reduce expiry time for reports 2016-06-10 12:59:50 +01:00
Keir Nellyer 36f47b7067 Clear report cache when report is closed 2016-06-10 12:41:02 +01:00
Keir Nellyer 09009c352b Remove new-line in query 2016-06-10 12:34:23 +01:00
Keir Nellyer 2cacdbae34 Use more robust Guava Cache class for caching 2016-06-10 12:33:46 +01:00
Thanos Paravantis 52ce640391 Merge branch 'develop' into thanos-mineware 2016-06-10 12:15:54 +03:00
Shaun Bennett e30cd6747b Increase goal 10 million, probably need to change later 2016-06-09 23:40:58 -05:00
Shaun Bennett 1d365d726c brawl fountain now displays proper info on the weekend 2016-06-09 23:40:58 -05:00
Shaun Bennett 08e47b4b1b Enable tips in bonus gui 2016-06-09 22:41:41 -05:00
Keir Nellyer 4503f12738 Implement report caching 2016-06-10 00:28:07 +01:00
Keir Nellyer 22dbcbf90d Move util method to sequence CompletableFuture's to new class 'UtilFuture' 2016-06-09 23:41:17 +01:00
Alex-The-Coder 77e9de0f8f Update required rank in
fountain add help message
2016-06-09 17:02:00 -05:00
Alex-The-Coder 0306f1d703 Update required rank in
booster command help message
2016-06-09 17:02:00 -05:00
Alex-The-Coder dbe8f39eeb Update required rank in
add booster help message
2016-06-09 17:02:00 -05:00
Keir Nellyer fe06fba406 Re-word from "hacking" to "guilty" so that button is applicable for both types of reports 2016-06-09 22:49:04 +01:00
Keir Nellyer ad17c620b7 Fix sql query for fetching report result counts 2016-06-09 22:48:18 +01:00
Keir Nellyer e24d67ecd3 Report errors when fetching a ReportProfile and attempt to recover from it 2016-06-09 18:11:38 +01:00
Keir Nellyer f0da319f46 Inventories must be handled on the main thread 2016-06-09 18:00:15 +01:00
Keir Nellyer 1db1257a05 Report message task for handler now checks if the report is still active
Due to recent changes, this no longer needs to run asynchronously as the CompletableFuture class already makes thing asynchronous for us.
2016-06-09 17:45:08 +01:00
Keir Nellyer 5d9a317f2a Fix sql queries which use reserved words 2016-06-09 17:06:44 +01:00
Keir Nellyer e113b0744d Fix incorrect column name when getting report reasons 2016-06-09 17:06:09 +01:00
Keir Nellyer 9dbef26b92 Fix small typo in comment 2016-06-09 16:34:18 +01:00
Keir Nellyer 8e48b00264 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-06-09 15:16:38 +01:00
cnr ba319599ba Fix fountain schematic file paths 2016-06-09 01:18:09 -05:00
Shaun Bennett 91f6ddce55 Add some minor documentation 2016-06-09 00:48:44 -05:00
Shaun Bennett 611cb28d1a Fix a typo 2016-06-09 00:47:03 -05:00
Shaun Bennett cade7b4081 Remove got boosters message 2016-06-09 00:43:59 -05:00
Shaun Bennett d6bce63967 Use schematics from update folder 2016-06-09 00:43:03 -05:00
Shaun Bennett ece08c23a9 Fix merge issues 2016-06-09 00:40:05 -05:00
Shaun Bennett 699b35995f Merge remote-tracking branch 'remotes/origin/develop' into feature/gems
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java
2016-06-09 00:39:39 -05:00
Shaun Bennett d4ac309daa Merge remote-tracking branch 'remotes/origin/master' into feature/gems 2016-06-09 00:29:27 -05:00
Shaun Bennett 85829d355d Fix command permissions 2016-06-09 00:25:54 -05:00
Shaun Bennett 22bb56dfda Remove game booster button 2016-06-09 00:22:54 -05:00
Shaun Bennett 09d2c00f66 Proper display of extra gem fountain rewards 2016-06-09 00:14:01 -05:00
cnr cf6e3cf05d Merge branch 'feature/game-variants' into develop 2016-06-08 22:47:16 -05:00
Shaun Bennett c9d5b91c52 Proper booster activation events 2016-06-08 19:22:25 -05:00
Shaun Bennett 37a412f1bf Starting to merge boosters into arcade code 2016-06-07 17:24:24 -05:00
Sam 298c09ab82 Lowercase rank prefixes in tablist when in party
When in a party the rank prefix in the tablist of every user is now
uppercase.
2016-06-06 20:45:07 +01:00
TadahTech 474a9dc975 Heavy UI and Command work. Begin testing
Time: 2hrs
2016-06-05 23:37:08 -05:00
TadahTech c577e5827c Heavy UI and Command progress.
Time: 4hrs
2016-06-05 22:55:06 -05:00
TadahTech a9c086172f Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 2016-06-05 19:06:15 -05:00
TadahTech ee35dd3442 Redis system implementation and code refactoring.
Total time: 13hr
2016-06-05 19:05:29 -05:00
LCastr0 2410151371 Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-06-05 17:46:27 -03:00
LCastr0 cb71bf4ba5 Removes morphs from gadget persistence (PC-429) 2016-06-05 17:44:34 -03:00
Sam 2755543686 Merge remote-tracking branch 'refs/remotes/origin/develop' into mopple 2016-06-05 15:32:06 +01:00
TadahTech 502111ef4e Redis system needs a shit ton of work. Need to design it better. 2016-06-05 00:42:22 -05:00
TadahTech 4ce9c90839 Party Redis init.
Wrap for 6/4/2016. Total time: 9.3 hrs.
2016-06-05 00:32:04 -05:00
TadahTech 8c3d5f66a2 UI work. 2016-06-05 00:03:01 -05:00
cnr 8de5280241 Disable /allowCmd 2016-06-04 22:55:15 -05:00
TadahTech bccc11eeaf Files changed that need to be edited later on with the new Party System.
Memory commit
2016-06-04 22:41:01 -05:00
TadahTech 84f428fa99 Redis work: Command work: UI work:
Total Time: 2.5hrs
2016-06-04 21:13:19 -05:00
TadahTech 22a438d5c1 Party system rewrite init. Barebones frame work: Total time - 2hrs. 2016-06-04 01:54:17 -05:00
Sam c01b6da390 Staff is incognito could be found using /stats (PC-Bugs-407)
Fixes an issue where players could do /stats <name> to find out if
vanished players were on their server.
2016-06-03 13:14:54 +01:00
LCastr0 c5cbca3ed0 Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-06-02 18:30:22 -03:00
Sam b51007da91 Merge remote-tracking branch 'refs/remotes/origin/develop' into mopple 2016-06-02 22:28:35 +01:00
LCastr0 b3291476cb Changed method names
Changed kit modifiers to be in an enum instead of creating a new class for each modifier
Implemented kit modifiers in the games
Removed renaming from Widder, Christmas Elf and Pumpling
Changed the persistence to have the system that Connor added
2016-06-02 18:25:16 -03:00
Thanos Paravantis c1bd25cdbe Merge branch 'develop' into thanos-mineware
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
2016-06-02 22:06:59 +03:00
cnr 894b7db18e Remove remaining fake ultra tag artifacts 2016-06-02 02:25:15 -05:00
Keir Nellyer 9465ab40ab Fix sql query for fetching name of user account 2016-06-01 16:51:22 +01:00
Sam 936eb1b978 Merge remote-tracking branch 'refs/remotes/origin/develop' into mopple 2016-06-01 15:41:22 +01:00
cnr 750120c106 Prevent developers from using /punish 2016-06-01 00:47:22 -05:00
cnr 84853a1f9a Revert "Update chat-spam message with coupon link"
This reverts commit dfbb4dca11.
2016-06-01 00:39:44 -05:00
cnr 825839d853 Fix PlayerKeyValueRepository's exception and return types 2016-06-01 00:38:29 -05:00
Sam 6cb275e036 PC-121
Changed 'a' to 'an' in the text component of the friend menu
2016-05-31 14:44:18 +01:00
Shaun Bennett 4e9a48ab4f Finish off the tip system 2016-05-30 12:02:12 -05:00
Thanos Paravantis e77bee5cd8 Implement building champion, remove quick climber and enhance chicken attack
Building Champion achievement was implemented as a replacement
for quick climber achievement, since quick climber is almost impossible
to complete in public games. Build Champion is based on Build Race challenge,
and it requires players to place all blocks in their inventory,
within 15 seconds. Moreover, chicken minions can now attack players,
even if they are stuck in the water.
2016-05-30 12:51:58 +03:00
Shaun Bennett e380354bad Refactor CurrencyType 2016-05-29 16:34:21 -05:00
Keir Nellyer 01855ba1ce Some small changes to the reporting system after some very shallow
initial testing has been done

Improve exception handling (so we actually get a stacktrace if
something goes wrong).
Check if users can report before showing the category gui.
Tell user if the report failed (due to some sort of internal error).
Correctly get the id of a report when inserting into the database for
 the first time.
Shorten some lambdas by using method references.
Remove some unused imports.
Small variable name changes.
2016-05-29 02:45:24 +01:00
Keir Nellyer 55392eae97 No need for 'this' keyword here 2016-05-29 01:10:42 +01:00
Keir Nellyer 075c2d21e9 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-05-29 00:27:48 +01:00
Keir Nellyer 20038f9e64 Massive changes made to how the report feature functions
Re-enabled report feature (merge from develop disabled it).
Moved reports from Redis to MySQL.
Made everything asynchronous.
Many many other miscellaneous changes.

Bugs will now be worked out and then this should be ready for QA testing
2016-05-29 00:25:26 +01:00
Shaun Bennett a1437a3044 Starting to add gui logic 2016-05-28 11:23:26 -07:00
Shaun Bennett aebcfc2727 Booster tip system 2016-05-28 09:21:10 -07:00
Shaun Bennett e00009a6d1 Fix CustomTagFix applying to holograms under certain conditions 2016-05-28 09:20:33 -07:00
xGamingDudex 4fc3c491f8 Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into feature/mavericks-master-builders 2016-05-28 02:04:27 +02:00
cnr dfbb4dca11 Update chat-spam message with coupon link 2016-05-27 13:18:07 -05:00
LCastr0 255191f01a Changed gadget persistence to use Player Key/Value system (Thanks to Connor)
Changed the method names for some classes
2016-05-26 23:58:36 -03:00
samczsun f1f464f3a4 Change listener priority again. Fixes PC-209 2016-05-26 14:29:13 -05:00
Keir Nellyer ad486a7e22 Merge remote-tracking branch 'origin/develop' into feature/report-v2
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/report/ReportCategory.java
2016-05-26 13:24:24 +01:00
cnr 1c66c10293 Don't create backing tables on startup 2016-05-25 17:59:21 -05:00
cnr 5331e2bec9 Allow PlayerKeyValueRepository Exceptions to propagate 2016-05-25 17:59:20 -05:00
xGamingDudex 8a2c30fa84 Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into feature/mavericks-master-builders 2016-05-26 00:06:23 +02:00
LCastr0 e52ff13712 Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-05-25 12:20:18 -03:00
LCastr0 460cb08f54 Adds old gadget names
Adds another fix for winroom speed
Moves gadgets to individual packages, easier to manage in a future update
Adds gadget persistence (Or maybe not)
Changed mount locked item data to 8 instead of 7
2016-05-25 12:19:06 -03:00
cnr 857cf6ad30 Add PlayerKeyValueRepository and BukkitFuture
PlayerKeyValueRepository<V> is a key/value store whose keys are Strings
and whose value type is parameterized by V. Each repository is backed by
a MySQL table in the Accounts database.

Access to PlayerKeyValueRepository's values is restricted via
CompletableFuture to enforce async database access.

BukkitFuture contains helpful utilities for producing, transforming, and
terminating CompletableFutures with actions on the main thread. A
typical PlayerKeyValueRepository action may look similar to the
following, where we retrieve all key/value pairs for a player and
perform an action with the result on the main thread:

    PlayerKeyValueRepository<String> repo = [...]; // init repo
    UUID uuid = [...]; // a player's UUID

    repo.getAll(uuid).thenCompose(BukkitFuture.accept(values -> {
        // this will be run on the main thread!
        // `values` is of type `Map<String,String>`
    }));
2016-05-25 08:35:05 -05:00
samczsun 72a2aa926f Change event priority again. Fixes PC-216 2016-05-24 13:15:29 -04:00
Sam Sun cd0e59087a Don't drop items from hidden slimes. Fixes PC-276 2016-05-24 13:15:29 -04:00
xGamingDudex f550df5a4b Initial game commit. 2016-05-24 13:31:59 +02:00
Shaun Bennett 434ada2e86 Fix merge issues 2016-05-24 19:14:52 +10:00
Shaun Bennett 1377e6724f Merge with develop 2016-05-24 19:10:55 +10:00
Shaun Bennett 12c5ba80b7 API Endpoints, Web calls, Gem Fountain Schematics, Game Menu Update, Booster implementation 2016-05-24 17:13:33 +10:00
Ben 8da4ac3135 [Brute/FleshHook] Deal more damage/pull velocity when charging up more [PC-340] 2016-05-23 23:42:12 +01:00
LCastr0 3ad7fc5f21 Adds old Mr.Punchman name
Adds another fix for winroom speed
2016-05-22 21:46:22 -03:00
LCastr0 ed68ef332b Fixes for Win Room (Players were able to see other players)
Added command to allow other players to run ranked commands
Fixes code styles
2016-05-22 21:05:48 -03:00
xXVevzZXx c984bbfc8a make it possible to add stats to the brawl games 2016-05-22 00:29:58 +02:00
LCastr0 92b6abc884 Fixes merging bugs 2016-05-20 23:53:27 -03:00
LCastr0 0109e2f2dd Fixes for Illuminated chest
Fixes for /check command (Support)
2016-05-20 23:33:58 -03:00
xXVevzZXx 0fb84e57c1 Merge branch 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
2016-05-20 23:26:54 +02:00
cnr d6750c7d91 Disable /unlockCosmetics on production servers 2016-05-20 03:23:27 -05:00
LCastr0 22fb507871 Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-05-20 05:14:29 -03:00
LCastr0 c58e0f3e30 Fixes for the 1 Shard thing (Next time, for testing, use /unlockCosmetics) 2016-05-20 05:11:59 -03:00
Shaun Bennett efb264dd75 Hook into Booster API 2016-05-20 16:58:58 +10:00
Thanos Paravantis 28f1d45b1c Update achievement category game enum 2016-05-19 20:55:22 +03:00
Thanos Paravantis 472d3881a0 Merge branch 'develop' into thanos-mineware 2016-05-19 20:49:45 +03:00
Thanos Paravantis 87c8c7efa4 Merge branch 'master' into thanos-mineware 2016-05-19 20:42:43 +03:00
cnr 7f44281441 Merge branch 'develop' into project-cosmetics 2016-05-19 10:04:19 -05:00
Shaun Bennett 012edfed45 Use loaded schematics to display fountain progress 2016-05-18 18:04:21 +10:00
LCastr0 11db05b6bf Fixes spelling of MineStrike gun
Fixes spectators not being sent to the

winroom
2016-05-18 03:58:50 -03:00
Shaun Bennett e3833b95ad Update Gem Fountain purchase gui 2016-05-18 15:59:04 +10:00
TadahTech 3479d6e318 Fix incognito. 2016-05-17 18:12:05 -05:00
TadahTech 38a0b593ee Fix height for 1.9 and 1.8 users.
*Thanks QA for not fully testing*....
2016-05-17 18:11:28 -05:00
Ben 35c7b9a2bd Incognito Updates:
-ADD: Prompt in Tab to identify who is in vanish (Can be a * or [Vanish])
-ADD: Make it so /stats don't work on vanished staff.
-ADD: Make sure it can be toggled off on /vanish again or network leave. Staff get stuck with it when resigning. Should stay on in-between lobbies.
2016-05-17 18:10:07 -05:00
Ben 8a75a5098c Remove hub invisibility preference for all but Admins and higher. 2016-05-17 18:08:01 -05:00
Ben 014ce137fc If a player uses /a regardless of if staff are online, offline, or vanished, making it always yield a response telling the player that if there are staff currently online, they will receive a reply soon - removing the "there are no staff online" message. Also a 60s Recharge for this. 2016-05-17 18:03:18 -05:00
Ben 6760c07e6c Fix staff members getting stuck in both Incognito mode and the Hub Invisibility preference, and not being able to toggle either off them off because Incognito would stop Hub Invisibility from getting toggled (on OR off), and vice versa. 2016-05-17 18:00:20 -05:00
AlexTheCoder 141cafcf28 Implement initial game code and add skeleton for full play 2016-05-17 17:29:23 -04:00
xXVevzZXx 6e9b0e4fa5 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java
2016-05-17 14:41:17 +02:00
TadahTech 43cadf564e Fix Carl the Creeper. Fix Bridges TNT exploit. 2016-05-16 22:03:27 -05:00
LCastr0 fb63b3a1a4 Fixes for winroom command, and illuminated chest 2016-05-15 22:49:10 -03:00
LCastr0 42eef838b3 Fixes podium not being enabled by default 2016-05-15 21:33:36 -03:00
xGamingDudex a27a618b2f Made debugging tools only available on test servers 2016-05-16 02:04:15 +02:00
xGamingDudex 816a7ca232 Re-Activated chest buttons 2016-05-16 01:57:58 +02:00
xGamingDudex d92ad9c53f Made illuminated chest purchasable and added appropriate lore 2016-05-16 01:51:40 +02:00
LCastr0 511726f72a Treasure chest coin checker for test servers 2016-05-15 20:43:46 -03:00
xGamingDudex 4ebf48bd45 Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics 2016-05-16 01:34:08 +02:00
xGamingDudex 8ad7646128 Edits to treasure chests 2016-05-16 01:33:54 +02:00
xGamingDudex f8d5bd3c11 Fixed treasure chests
Items would sometimes pop out of chest blocks
You could open illuminated chests before they were converted to real
chests
2016-05-16 00:51:33 +02:00
LCastr0 09b7fbdbbe Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-05-15 18:48:00 -03:00
LCastr0 4f79ec6551 Pinata fixes 2016-05-15 18:47:09 -03:00
xGamingDudex b4aad690e5 Fixed some rewards and added party trail to chests 2016-05-15 23:31:10 +02:00
xGamingDudex fdf167953f Fixed emerald set order 2016-05-15 23:30:17 +02:00
xGamingDudex 1e6dda2d7d Cleaned up some win effect backend code & fixed kits working in winroom 2016-05-15 23:28:12 +02:00
xGamingDudex d850bed725 Minor code tweaking
* Made reward manager ammo multiplier private final field
* Removed old commented code from WinEffectPodium, WinEffectLavaTrap,
ParticleMusic, ParticleEmerald, ParticleBlood
* Cleaned up the GameModifierMineStrikeSkin filter
* Removed unused Math#isBetween(double, double, double) method
* Changed Animator to use PriorityQueue
2016-05-15 19:43:07 +02:00
xGamingDudex 97f82e422d Merge branch 'project-cosmetics' of
ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into
project-cosmetics

Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/animation/Animator.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/animation/AnimatorEntity.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ICosmeticShape.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ShapeWings.java
2016-05-15 16:03:36 +02:00
xGamingDudex 22e54557d8 Fixed cleaning method for WineffectRiseOfTheElderGuardian
The class contained commented code, removed when debugging
2016-05-15 15:33:42 +02:00
xGamingDudex abddc446fd Added java docs and tweaked code
* Fixed possible duplication bug in MulitBlockUpdaterAgent
* Tweaked some of the factor methods for Shape.java
* Cleaned some code in ShapeWings.java
2016-05-15 15:32:44 +02:00
LCastr0 1cc44d1b3e Fixes for the following classes:
KitGameModifier
KitModifierType
MultiBlockUpdaterAgent
Shape
GadgetManager
KitModifierType
HatLovestruck
HatSecretPackage
SetLove
Animator
AnimatorEntity
AnimationPoint
ICosmeticShape
UtilText
KitGameModifier
KitModifierType
Removed build.xml and org.eclipse.jdt.ui.prefs
2016-05-15 00:20:07 -03:00
xGamingDudex 24f7a4b409 Added "(Minestrike Weapon Skin)" suffix to MS skins in treasure rewards 2016-05-14 18:53:09 +02:00
samczsun b2e92fdf15 Don't pass on INTERACT_AT as INTERACT. Fixes PC-114 2016-05-14 09:42:28 -05:00
LCastr0 20b9f428b4 Fixes Illuminated Chest's Lore
Fixes Pinata Burst not being saved
Fixes AWP Asiimov and XM1014 Tranquility materials
Removes Fireworks WinRoom
Changes prices of things from 1 shard to Treasure Chest
More unused imports removed
Fixed ANGLE_WING_PATTERN -> ANGEL_WING_PATTERN
Adds javadoc to UtilColor.applyColor()
Adds javadoc to UtilColor.getNextColor()
defaultLeatherColor -> DEFAULT_LEATHER_COLOR
Adds suggestions for UtilColor
Adds final modifier to _worldBorders (UtilPlayer)
Changed _worldBorders key from String to UUID
Adds suggestion for UtilPlayer
Adds final modifier to _type (GameModifierSubPage)
Adds final modifier to _type and _kitType (KitGameModifierPage)
DefaultDencity -> DefaultDensity (Shape)
Changed <Vector> to <> (Shape)
dencity -> density (ShapeBox, ShapeGrid, ShapeSphere)
Using speed and count in constructor (ShapeWings)
Removed empty constructor (WorldGenCleanRoom, MultiBlockUpdaterAgent)
Adds final modifier to all fields (AnimationPoint)
2016-05-14 01:18:37 -03:00
Shaun Bennett b802cdec6d Rename shop to "Fountain Keeper" 2016-05-14 14:01:28 +10:00
xXVevzZXx 63c44afa10 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants 2016-05-13 22:05:27 +02:00
xXVevzZXx df5c628c35 add new gamemodes Tiny Winners, Random Kit SSM, UHC SW, UHC SG and improve OP SG, OP SW, OP Bridges, Dukes of decoration, OP Gladiators, Faster than Light, Bunny Hopper and Countdown 2016-05-13 20:23:04 +02:00
xGamingDudex 2cc609b67e Moved some rewards from normal to valentines 2016-05-13 01:28:26 +02:00
xGamingDudex 35ab155756 Removed unnecessary lore from minestrike game modifiers 2016-05-13 01:20:06 +02:00
xGamingDudex d34f77a381 Moved some rewards from normal to winter chest 2016-05-13 01:19:06 +02:00
xGamingDudex 9c2c415eb2 Fixed the emerald trail leaving from idle to moving 2016-05-13 01:14:00 +02:00
xGamingDudex 3bb3821fa9 WinEffect gadget disable and MineStrike name and data update 2016-05-13 01:04:35 +02:00
xGamingDudex 4958ab8149 Bug Fixes
* Fixed Menu page adding glow to win effects if game modifiers were
active
* MineStrike skins were not properly applying material and data
* Skinned knife was not dealing damage
2016-05-13 00:38:56 +02:00
xGamingDudex 06e583c05e Added flat podium to Firework and Punchman 2016-05-12 23:50:41 +02:00
xGamingDudex 956d64d750 Git Merge Import Fix 2016-05-12 23:46:39 +02:00