samczsun
4cd643f64f
PC-1040
...
In one of my previous commits, while migrating CompassAddon ->
CompassModule I accidentally removed two logical components. The first
prevented compasses from being given out in the pregame lobby, and the
second allowed players who were dead to receive compasses. Both have been
re-added.
2017-01-18 23:20:24 -06:00
samczsun
283dd23920
PC-1298
...
In the 1.11 update, the override was mistakenly toggled off while spawning
in horses. This commit undoes that change.
2017-01-18 23:20:24 -06:00
LCastr0
912bad5035
Used wrong method name
2017-01-18 21:20:32 -02:00
LCastr0
1557f3a39c
Added love chest to customer support server
2017-01-18 21:02:57 -02:00
LCastr0
ed8363e1be
Added items to infused chests
2017-01-18 20:57:54 -02:00
LCastr0
4cdb652b79
Removed winter items from infused chests
2017-01-18 20:35:17 -02:00
LCastr0
ad9caa68a0
Small change to treasure page
2017-01-18 20:34:16 -02:00
LCastr0
f93794f14d
Removed permissions for snr mods to use unlock cosmetics
2017-01-18 20:31:35 -02:00
LCastr0
6ba1901490
Revert "Revered changes to chest page"
...
This reverts commit 419c4b1053
.
2017-01-18 01:07:50 -02:00
LCastr0
419c4b1053
Revered changes to chest page
2017-01-18 00:52:36 -02:00
LCastr0
3e16c7fdf0
Added items to love chest (missing win room)
2017-01-17 23:34:16 -02:00
LCastr0
d49e85c21a
Corrected chances for love chest
2017-01-17 23:30:29 -02:00
LCastr0
447a1cee18
Removed unused code
2017-01-17 23:28:19 -02:00
LCastr0
09c43ce73b
Added love chets to titles tracking
2017-01-17 23:26:09 -02:00
LCastr0
65cc1b598d
Change Flame Rings icon
...
Fixed issue with buy chest button
2017-01-17 21:08:38 -02:00
LCastr0
75ede7f823
Fixed present danger display item
2017-01-17 20:21:37 -02:00
LCastr0
27aa682727
Stops players from purchasing the chest
2017-01-17 20:20:17 -02:00
LCastr0
76b356f73c
Removed gingerbread chest
2017-01-17 19:24:27 -02:00
Sam
1a580251e9
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-01-17 09:51:17 +00:00
LCastr0
cdd1e63989
Ops, are we back in time? Fixed lore saying 2012 instead of 2017
2017-01-17 06:30:47 -02:00
LCastr0
ccd490b41a
Added love chest
2017-01-16 21:06:24 -02:00
LCastr0
819741d8ff
Removed gadget selection since it will only work during games
2017-01-16 19:55:28 -02:00
LCastr0
a70c8eccc6
Blow a kiss taunt
2017-01-16 19:43:49 -02:00
LCastr0
ddc098649f
Cupid Pet
2017-01-16 19:28:06 -02:00
LCastr0
694b2f69b2
Love train mount
2017-01-16 19:02:22 -02:00
LCastr0
ebfd6e5cc5
Use correct way for adding pets to ppc
2017-01-16 04:19:57 -02:00
LCastr0
c571736def
Silent villager
2017-01-16 01:57:42 -02:00
LCastr0
9e4f756fe8
Even better way of making pet circle around you
2017-01-15 02:46:44 -02:00
LCastr0
7600cd6e04
Added enderman gun
2017-01-15 00:07:48 -02:00
LCastr0
46552428a4
Make them slower
2017-01-14 23:55:24 -02:00
LCastr0
6e399b10db
Increased radius
2017-01-14 23:27:02 -02:00
LCastr0
3d49eb2181
Better way to handle the circle points
2017-01-14 23:21:49 -02:00
LCastr0
2398fbc8c9
Added correct ppc lore
2017-01-14 23:15:41 -02:00
LCastr0
6c75f6e7dc
Showing correct icon for pets
2017-01-14 23:12:31 -02:00
LCastr0
fb05a08e91
Merge branch 'develop' into update/true-love-pet
2017-01-14 23:10:20 -02:00
LCastr0
28442abbbd
Now using the correct naming...
2017-01-14 23:09:46 -02:00
LCastr0
e03b59bb7c
Added love wings to gadget manager
2017-01-14 22:22:17 -02:00
LCastr0
03c2ec56b7
Added love wings
2017-01-14 22:21:38 -02:00
LCastr0
33cb3b74fc
Added love doctor morph to gadgetmanager
2017-01-14 22:11:25 -02:00
LCastr0
fa9f895891
Use the correct event
2017-01-14 21:01:18 -02:00
LCastr0
d667524ed9
Love Doctor Morph
2017-01-14 20:50:44 -02:00
LCastr0
2976eab5bf
Added particles
2017-01-14 20:06:12 -02:00
LCastr0
8c11f2c4cb
Added True Love Pet
2017-01-14 18:57:40 -02:00
cnr
ef53ae5737
Reinstate missing _showInterface check
2017-01-14 13:59:06 -06:00
cnr
5ba3fac58c
Check twofactor status instead of interact events
2017-01-14 01:29:37 -06:00
LCastr0
babc72a87c
Fixed lore
2017-01-13 23:31:22 -06:00
samczsun
1a5a530133
Fix Evolution crash
2017-01-13 23:30:13 -06:00
cnr
66bff40040
Update StaffServer whitelist
2017-01-13 21:52:02 -06:00
cnr
bb2477676c
Add missing diff from PP-Bizon fix
2017-01-13 14:24:48 -06:00
Sam
b55902f853
World events
2017-01-13 17:16:36 +00:00
cnr
d5160bf10b
Don't register https scheme in BungeeRotator
2017-01-13 03:07:50 -06:00
cnr
89ccaf4323
Disable hotbar items when authenticating with 2FA
2017-01-13 01:14:31 -06:00
samczsun
a4614fe3b4
Drastically reduce BungeeRotator size (3MB!!!)
2017-01-12 23:23:11 -06:00
samczsun
251eb2e53e
Let's be legal
2017-01-12 23:22:40 -06:00
samczsun
e82d1b5885
Remove spigot as a dependency from ServerData
2017-01-12 23:22:39 -06:00
cnr
cdfc19f566
Ignore canceled player interact events
2017-01-12 23:05:34 -06:00
LCastr0
2bb8023b47
Changed chest spawn animation
2017-01-12 18:20:19 -06:00
LCastr0
4a803c1482
Fixed NPE, weapon name is now back at the lore
2017-01-12 18:20:14 -06:00
cnr
8d33a49397
Use a more explicit title for classic MineStrike
2017-01-12 15:59:57 -06:00
LCastr0
85eb38032f
Added minestrike chest to treasure hunt track
2017-01-12 18:50:55 -02:00
LCastr0
9385144566
Lowered the cost from 20000 to 10000
2017-01-12 16:52:36 -02:00
LCastr0
353cefe949
Added weapon name after skin name
...
Changed lore and icon of MS chest
2017-01-12 16:36:29 -02:00
Sam
d5be0f5061
Remove args to match new parameters
2017-01-12 18:04:59 +00:00
Sam
3d64319180
Missing commands
2017-01-12 18:03:40 +00:00
Sam
8d47e80066
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-01-12 18:03:07 +00:00
LCastr0
4b3b7849eb
Added MS chest to customer support server
2017-01-12 15:55:15 -02:00
cnr
ac32fbb15e
Add StrikeGames to MineStrike NPC's server page
2017-01-12 00:54:59 -06:00
samczsun
132036bd17
Move Constants to common
2017-01-11 20:42:46 -06:00
samczsun
e72d1e51a2
Ignore bypass for testing sever motd
2017-01-11 20:29:37 -06:00
samczsun
39ba03d1b4
Convert to UtilServer.isTestServer
2017-01-11 20:29:36 -06:00
samczsun
19ac8f0c3b
Create framework for proper test network
2017-01-11 20:29:36 -06:00
Nate Mortensen
e339b0352a
Make GameComponent generic and store an instance of the Game.
2017-01-11 20:04:48 -06:00
samczsun
5c4cc48e86
More QA changes
2017-01-11 19:50:26 -06:00
samczsun
4fd92a3402
Fix remainder of parties bugs
2017-01-11 19:50:26 -06:00
samczsun
56d4ed9e11
Parties rewrite
...
Basically everything got changed. Also Portal has a slightly better API
now
2017-01-11 19:50:26 -06:00
cnr
91773de97e
Don't use metadata for two-factor auth
2017-01-11 16:17:03 -06:00
Kenny
6f2705f0e4
Reduce size of bungeerotator jar
...
Make use of the maven shade plugin's `minimizeJar` option to filter out
classes not explicitly mentioned, and use two artifact filters to
explicitly include classes used. Also removes the mysql driver check in
the main method as it is not necessary for this program to work.
2017-01-11 15:46:20 -06:00
cnr
cea08cae67
Merge branch 'update/cosmetics-balloons' into develop
2017-01-11 15:32:41 -06:00
xXVevzZXx
1095f8bc49
Respack links
2017-01-11 15:29:50 -06:00
xXVevzZXx
5a2ed59a38
Make Strike Games an actual game, disable Hunger and remove food from loot
2017-01-11 15:29:50 -06:00
Shaun Bennett
28a83ef722
Don't delete old client when being replaced (solves enjin listener issue)
2017-01-11 15:28:59 -06:00
samczsun
cbe238c83d
Don't give book on join
2017-01-11 15:11:57 -06:00
samczsun
716c77451e
Update the right titles
2017-01-11 15:11:57 -06:00
samczsun
fbaeffc96e
Remove EventHandler annotation
2017-01-11 15:11:57 -06:00
samczsun
99211d5d89
Fix particles
2017-01-11 15:11:57 -06:00
samczsun
cb13fb1ccc
1.8 titles!
2017-01-11 15:11:57 -06:00
samczsun
bcea0044e8
Animated Titles!
2017-01-11 15:11:57 -06:00
Nate Mortensen
e803df6884
Fix Blink ability with Spectators
...
When using blink, players are teleported away from other players
within a one block radius of them. However, if a player happens
to have the exact same position(only can occur when a player is
spectating them), division by 0 occurs, resulting in the player
being teleported to NaN, as any operation with NaN is also NaN.
To fix this, Blink now ignores players in Spectator mode. This
change could also address the hypothetical scenario where a
spectator is within the one block radius and results in a blinking
player getting teleported in a weird direction.
2017-01-11 15:07:48 -06:00
Nate Mortensen
9583c7abcb
Run Minestrike in Adventure Mode
2017-01-11 15:07:48 -06:00
Nate Mortensen
0bb01d39b6
Fix PP-Bizon skin
2017-01-11 15:07:48 -06:00
Nate Mortensen
afaed17071
Fix kill reward for skinned knives
2017-01-11 15:07:48 -06:00
Nate Mortensen
e1aeaa8714
Add damage metadata system to CombatLog and CustomDamageEvent
...
This adds a system whereby plugins can associate metadata with individual
damage events and then retrieve that metadata later from the CombatLog.
One example use case for this is Minestrike. Players are rewarded according
to the weapon that they used to kill another player, however the weapons
are frequently renamed. Minestrike can now associate a "gunType" key
to the name of the weapon used to kill the player, regardless of the skin
that the gun currently has applied to it.
2017-01-11 15:07:47 -06:00
Nate Mortensen
8384c47e53
Create Lifetime system for managing Listeners with a defined duration.
...
This commit introduces a Component system focused around Games, which is completely
backwards compatible, as well as designed to be flexible enough for later improvements
such as dependency injection. Each GameState is associated with a phase of the
PhasedLifetime that each Game has. Components can be registered with a specific phased
or the entirety of the Lifetime. Refer to the javadocs for Lifetime and PhasedLifetime
for more details. Currently the main two Component types are ICommand and
ListenerComponent.
This commit includes the first refactoring into using this system, which is replacing
the Wizards minigame's usage of Miniplugin with a Lifetimed Component, allowing for
the shop to be appropriately registered and unregistered. This change allows for
Wizards to be run more than once on the same server instance. Previously, attempting
to register the Miniplugin twice would result in the minigame failing to start after
the initial registration.
This commit additionally includes slight refactoring within GameCreationManager as
required for the Lifetime system to function correctly. These changes ensure that
Games are only disabled once, whereas before they could be repeatedly disabled.
The previous implementation of disable(), along with the classes that override it,
functioned correctly despite being called several times.
Finally, this commit adds in changes to the pom to allow for unit testing.
2017-01-11 15:07:47 -06:00
LCastr0
0a655932af
IntelliJ removed an import after I commited last time
2017-01-11 15:50:53 -02:00
LCastr0
5e85f48c87
Fixed balloons still being added to chests
2017-01-11 01:54:53 -02:00
LCastr0
21473a7d82
Fixed merge conflict
2017-01-10 21:27:47 -02:00
LCastr0
d3e6a094e5
Removed balloons for now, will be in the next update
...
Updated cosmetics menu
Added weapon name to skin lore
2017-01-10 21:08:03 -02:00
Sam
64026f81ff
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-01-08 21:12:28 +00:00
Sam
0218965bee
Villager trading and loot upgrades
2017-01-08 15:44:04 +00:00
cnr
990c548e7b
Disable Thanksgiving chickens
2017-01-06 01:06:10 -07:00
cnr
cbc5ed491c
Check two-factor status for every player on login
2017-01-05 19:16:28 -07:00
cnr
96c15376aa
Use default 2FA window size (3)
2017-01-05 15:20:10 -07:00
cnr
435abbba08
Allow builders to use 2FA
2017-01-05 10:48:56 -07:00
cnr
a2472f45b4
Cancel commands when authenticating with 2FA
2017-01-05 10:44:03 -07:00
cnr
fa6a60981c
Return to normal hub type
2017-01-04 20:36:16 -07:00
cnr
f08068c717
Revert "Enable double XP + gems for the holidays"
...
This reverts commit d3bcc77e01
.
2017-01-04 20:34:09 -07:00
cnr
3af401ee8f
Implement two-factor authentication
2017-01-04 20:33:09 -07:00
Sam
571840e249
Lots more changes
2017-01-02 14:40:13 +00:00
LCastr0
17bdfe6814
Started on the flying mechanics stuff
2016-12-30 12:44:49 -02:00
LCastr0
1aca03b22d
Added balloons to normal chests
2016-12-30 12:17:52 -02:00
LCastr0
ef7bbfe7eb
Added Balloons to omega chest
2016-12-30 12:10:26 -02:00
LCastr0
9578864f8a
Added display item
2016-12-29 21:49:20 -02:00
LCastr0
9ec8835374
Fixed block balloons!
2016-12-29 21:40:02 -02:00
LCastr0
16e40c2896
Added shotgun skin
2016-12-29 19:18:09 -02:00
LCastr0
fcec0399cd
Added remaining skins to chest
2016-12-29 19:08:31 -02:00
LCastr0
5f0de2e5e3
Allows 2 chests to be opened and dupes for minestrike chest
2016-12-29 18:04:24 -02:00
LCastr0
c877f20031
Added other skins, forgot this on the last commit
2016-12-29 18:00:18 -02:00
LCastr0
025a43b519
Added ms skins to their own chest, and added chest to page
2016-12-29 17:58:48 -02:00
LCastr0
36303a0fe8
Added new minestrike skins (some, at least?)
2016-12-29 17:43:50 -02:00
LCastr0
8131656ae2
Changed RankReward to have Eternal rank
2016-12-29 17:06:07 -02:00
LCastr0
7f7f3b9954
Removed thanksgiving chickens
2016-12-29 17:01:30 -02:00
LCastr0
4c6298bb63
Merge branch 'develop' into update/cosmetics-balloons
2016-12-29 16:28:13 -02:00
LCastr0
6478656501
Fixed armorstand balloon types
2016-12-29 16:25:20 -02:00
Sam
0ba22f9201
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2016-12-28 22:33:04 +00:00
cnr
efea2b0c1d
Merge branch 'feature/dinnerbone-morph' into develop
2016-12-28 15:19:06 -07:00
cnr
c7d5e149f8
Fix NullPointerException in speed builders
2016-12-28 15:18:59 -07:00
Sam
4f497a2025
Rank rewards
2016-12-28 18:48:19 +00:00
Sam
4c7f5c5716
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2016-12-27 18:59:03 +00:00
Sam
e114ab03b5
Chest spawning
2016-12-27 17:20:53 +00:00
Sam
3a6cef32a4
Add Gem Hunters as a catagory for the build server
2016-12-26 22:45:18 -07:00
cnr
d3bcc77e01
Enable double XP + gems for the holidays
2016-12-26 22:43:32 -07:00
cnr
0b4d217303
Reduce number of redis requests by communities
2016-12-26 22:34:09 -07:00
LCastr0
c685486086
Fixed some types of entities
2016-12-27 00:58:16 -02:00
LCastr0
5198d64ab8
Added all the balloons!
2016-12-27 00:29:48 -02:00
LCastr0
092cde9973
Renamed to BalloonData
2016-12-27 00:01:42 -02:00
LCastr0
cd70305afb
Make leashes not break (WITHOUT packets ;))
2016-12-26 23:17:04 -02:00
LCastr0
f25c592a6d
Removed commented code
2016-12-26 22:20:23 -02:00
LCastr0
78510ffbbf
Allows multiple balloons
2016-12-26 22:19:08 -02:00
LCastr0
5e420a20d8
Changed temporary display item so it doesn't bug with 1.11
2016-12-26 20:21:43 -02:00
LCastr0
d19d661c7d
Modified pets so they don't make different sounds anymore :toot:
2016-12-26 19:02:35 -02:00
LCastr0
6712ad427b
Added bat so players can use items in hand with the leash
...
Changed silence method so it works :toot:
2016-12-26 19:00:11 -02:00
LCastr0
c11755558e
Ops, those comments are wrong...
2016-12-26 18:27:01 -02:00
LCastr0
1d2a538fd6
Renamed Balloons page name
2016-12-26 18:23:27 -02:00
LCastr0
b422832276
Fixed Cosmetics menu positions
2016-12-26 18:22:57 -02:00
LCastr0
4ebc82bf1f
Added balloons
2016-12-26 18:10:42 -02:00
Sam
a4a039b619
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2016-12-25 22:09:03 +00:00
Sam
a1dc9135c8
Sprint work
2016-12-25 22:06:10 +00:00
LCastr0
fb9720c926
Added padding to menu
2016-12-25 16:21:46 -02:00
LCastr0
7e6810e10f
Added a balloon to the menu
2016-12-25 16:12:05 -02:00
LCastr0
45d4e5ce6e
Added Balloons to the cosmetics menu
2016-12-25 16:01:49 -02:00
LCastr0
246db919d9
Changed permissions for Unlock Cosmetics
2016-12-25 15:35:53 -02:00
LCastr0
de73307754
Added morph to january ppc prize
2016-12-25 15:35:25 -02:00
LCastr0
140da98922
Merge branch 'develop' into feature/dinnerbone-morph
2016-12-25 15:34:00 -02:00
samczsun
10bed92a6a
Change morph description
2016-12-24 17:38:29 -05:00
samczsun
fe8823c134
Re-order morphs
2016-12-24 17:38:09 -05:00
samczsun
81d769db5b
Fix issues regarding disguising
2016-12-24 14:18:33 -05:00
samczsun
eacbdfdb02
Convert morph to packets
2016-12-24 14:07:41 -05:00
cnr
73cefb69c9
Use redis pipeline for community player statuses
2016-12-24 00:39:59 -07:00
cnr
08d65f3662
Load communities with 4 queries instead of 3n+1
2016-12-23 21:33:17 -07:00
LCastr0
0aec8889fa
Added lore
2016-12-23 23:56:43 -02:00
AlexTheCoder
35a9eabf74
Use UUID object instead of String for PlayerStatus and FriendStatus, as well as update CommunityJoinRequestInfo on a task
2016-12-23 18:34:52 -05:00
AlexTheCoder
74a6071d4e
Refactor Redis PlayerStatus to use UUID as a key instead of Name, and make communities not force every server to subscribe to join publishes from proxies
2016-12-23 18:03:08 -05:00
AlexTheCoder
4ae21e66c9
Delete new communities if the leader has been transferred a new community during creation
2016-12-23 18:03:08 -05:00
LCastr0
675642a100
Disable on tp and do not allow mounts
2016-12-23 19:53:49 -02:00
LCastr0
9fad633b88
Ops, lava, not water
2016-12-23 19:13:50 -02:00
LCastr0
c0afad0723
Fixed morph with lava, water, void and ender pearls
2016-12-23 18:15:26 -02:00
LCastr0
7f6f3464a1
Fixed chest pages again
2016-12-23 17:48:37 -02:00
William Burns
1e0ba62557
To many typos.
2016-12-23 11:15:46 -07:00
AlexTheCoder
7a482c3386
Implement system to run code when an SQL error occurs, and ensure that duplicate key errors on community creation inform the community creator
2016-12-22 22:32:04 -07:00
AlexTheCoder
ac8d8aa69c
Prevent Name value in info classes from being null
2016-12-22 22:32:04 -07:00
AlexTheCoder
0a69562579
Improve communities member page sorter to base on role as well as name and online status
2016-12-22 22:32:04 -07:00
AlexTheCoder
09e711e202
Properly get online player key from redis
2016-12-22 22:32:04 -07:00
AlexTheCoder
8e9336ad23
Make community button refresh with join requests
2016-12-22 22:32:04 -07:00
AlexTheCoder
9acd6b7832
Ensure comparison of ints with == instead of Integers
2016-12-22 22:32:04 -07:00
AlexTheCoder
286a9fe246
Fix various synchronization issues and make community creation load the new community through redis instead of a database call
2016-12-22 22:32:04 -07:00
AlexTheCoder
66c6f66768
Fix threading of community create command and make invite loader run on a LoginProcessor
2016-12-22 22:32:04 -07:00
AlexTheCoder
36f671d944
Use UtilPlayer.message instead of sender.sendMessage to fit standards
2016-12-22 22:32:04 -07:00
AlexTheCoder
e5aaa555b7
Make join request name updating redis-based
2016-12-22 22:32:04 -07:00
AlexTheCoder
56ecab1985
Make community membership updating entirely redis-based
2016-12-22 22:32:04 -07:00
samczsun
a0716ae774
Try to prevent duplicate bans even more
2016-12-22 22:42:07 -05:00
samczsun
1bcbddee87
Remove VL logging for good
2016-12-22 22:32:56 -05:00
LCastr0
6870bf31db
Merge branch 'feature/dinnerbone-morph' of github.com:Mineplex-LLC/Minecraft-PC into feature/dinnerbone-morph
2016-12-23 00:53:18 -02:00
LCastr0
4c58e852d0
Fixed a bug with treasure pages after buying a chest
2016-12-23 00:53:01 -02:00
samczsun
bbd695981d
Don't summon titles if player is morphed
2016-12-22 21:06:39 -05:00
cnr
df5c53766c
Disable VL logging
2016-12-22 17:54:50 -07:00
cnr
ca19840b19
Revert "Disable communities temporarily."
...
This reverts commit 6d5d2b551b
.
2016-12-22 16:50:35 -07:00
cnr
2fe9423196
Remove inner query in CommunityRepository
2016-12-22 16:44:26 -07:00
LCastr0
7322e05ac4
Added the custom display item to menus
2016-12-22 18:58:38 -02:00
LCastr0
38e9daa377
Added display item feature again
2016-12-22 18:23:42 -02:00
LCastr0
ac6440a3c6
Merge branch 'develop' into feature/dinnerbone-morph
2016-12-22 17:09:33 -02:00
Kenny
253c907ba1
Update Anticheat dependency in core
2016-12-22 12:33:27 -05:00
William Burns
6d5d2b551b
Disable communities temporarily.
2016-12-22 17:07:36 +00:00
cnr
69670a4b99
Pass accountId at community creation time
2016-12-22 01:17:44 -07:00
LCastr0
09afab39d6
Merge branch 'develop' into feature/dinnerbone-morph
2016-12-22 03:51:40 -02:00
AlexTheCoder
623703cc76
Insert MCS as type Community in redis
2016-12-21 19:31:57 -07:00
AlexTheCoder
65522a364f
Update lobby file used by MCS
2016-12-21 19:31:56 -07:00
AlexTheCoder
0b92bc2263
Fix redis host value for MCS
2016-12-21 19:31:56 -07:00
AlexTheCoder
b73e51b345
Fix invites and member data loading communities from the wrong regions
2016-12-21 19:31:56 -07:00
AlexTheCoder
d4904fa02a
Fix communities commands having incorrect coloring in their help messages
2016-12-21 19:31:56 -07:00
AlexTheCoder
d0c2906467
Fix community invites storing twice in player data if it is a duplicate
2016-12-21 19:31:56 -07:00
AlexTheCoder
1190d4a427
Fix communities queries having the ability to lock the server mysql connections due to nesting, improve RepositoryBase by allowing all the methods to be passed a Connection object to reuse it, and fix duplicate invites throwing an sql error
2016-12-21 19:31:56 -07:00
AlexTheCoder
cc3842f019
Synchronize BrowserIds List and update the browser GUI when a contained community is disbanded
2016-12-21 19:31:56 -07:00
AlexTheCoder
941b33bcfc
Replace Integer == with Integer.intValue() == so as to avoid edge case errors
2016-12-21 19:31:56 -07:00
AlexTheCoder
1cb6151817
Allow CUST-1 to set players to ETERNAL via support commands
2016-12-21 19:31:56 -07:00
AlexTheCoder
dad7346313
Fix incorrect placement of thankful chest on cust server display
2016-12-21 19:31:56 -07:00
AlexTheCoder
07f2679275
Fix preference ordinal being shifted due to community invite preference being added in the middle, and added region-locking to community names so as to stop EU and US communities from having the same name due to independent redii
2016-12-21 19:30:54 -07:00
AlexTheCoder
eabda7f8c6
Fix alpha numeric check and slight potential concurrency issues
2016-12-21 19:30:54 -07:00
AlexTheCoder
bcbc6fdea4
More fixes and stylistic changes from iteration
2016-12-21 19:30:54 -07:00
AlexTheCoder
92e5c74fff
Update PersonalServerManager to launch the MCS with the community's favorite game
2016-12-21 19:30:54 -07:00
AlexTheCoder
94d8e5d2f4
Update Formatter to support specifically colored commands
2016-12-21 19:30:54 -07:00
AlexTheCoder
8bb279a8fb
Remove game tips from MCS
2016-12-21 19:30:53 -07:00
AlexTheCoder
2611ba7a7a
Bugfixes from iteration, & new features requested by sampson sigils and relyh
2016-12-21 19:30:53 -07:00
AlexTheCoder
2cacbcbc1c
Update community repository to latest changes
2016-12-21 19:30:27 -07:00
AlexTheCoder
df3c2d5d67
Fix champions being permanently disabled
2016-12-21 19:30:27 -07:00
AlexTheCoder
1a3a48115c
Set up personal server manager to be able to create an MCS
2016-12-21 19:30:27 -07:00
AlexTheCoder
095fbfa255
Fix error caused by GIT client with MCS themes and actually register redis commands in the miniplugin
2016-12-21 19:30:27 -07:00
AlexTheCoder
cbe1a617af
Support the MCS in Arcade
2016-12-21 19:30:26 -07:00
AlexTheCoder
fe62e5a683
Make server monitor support MCS and servers with multiple '-' characters
2016-12-21 19:30:26 -07:00
AlexTheCoder
bd4fa1f2d4
Convert to MCS system for community servers and add a command to open them
2016-12-21 19:30:26 -07:00
AlexTheCoder
0668e31710
Implement various events to interact with the GUIs and update them when changes to communities or playerdata occur
2016-12-21 19:30:26 -07:00
AlexTheCoder
024a58e0fa
Create data classes to handle information about join requests and community members, as well as increasing the amount of information held for online players in their MemberData
2016-12-21 19:30:26 -07:00
AlexTheCoder
cefc3344ab
Set up redis pub sub commands to transfer communities information across the network
2016-12-21 19:30:26 -07:00
AlexTheCoder
39f2c94718
Update the Communities miniplugin to contain a variety of redis and player interaction
2016-12-21 19:30:26 -07:00
AlexTheCoder
2a971d616c
Complete setting up community data class
2016-12-21 19:30:26 -07:00
AlexTheCoder
471ea8942f
Create an enum to manage different unlockable MPS themes
2016-12-21 19:30:26 -07:00
AlexTheCoder
216b4fe947
Further set up communities database class
2016-12-21 19:30:26 -07:00
AlexTheCoder
9ba38ffd3b
Implement all communities commands
2016-12-21 19:30:26 -07:00
AlexTheCoder
d44a3774db
Implement communities GUI system with several pages for community management
2016-12-21 19:30:26 -07:00
AlexTheCoder
f6362676ff
Implement more settings for communities
2016-12-21 19:30:26 -07:00
AlexTheCoder
fd30fca035
Remove an unused preference class and convert friends preferences to social preferences so as to add communities preferences in that section
2016-12-21 19:30:26 -07:00
AlexTheCoder
88fc34def4
Implement a setting to configure whether a game type can be the favorite game of a community
2016-12-21 19:30:25 -07:00
AlexTheCoder
482f0e5b2a
Implement a method for loading client data from the web server for offline uuids
2016-12-21 19:30:25 -07:00
AlexTheCoder
1a0bd7ffb0
Set up more settings
2016-12-21 19:30:25 -07:00
AlexTheCoder
7b23c1bdd2
Change SQL queries a bit to be more efficient
2016-12-21 19:30:25 -07:00
AlexTheCoder
a2fb0bb491
Implement more backend for communities and add a command base
2016-12-21 19:30:25 -07:00
AlexTheCoder
0007ffc91e
More backend for handling community settings
2016-12-21 19:30:25 -07:00
AlexTheCoder
5143a7cd61
Change/Expand redis interaction and community storage, implement chat formatting
2016-12-21 19:30:25 -07:00
AlexTheCoder
ac224e3f68
Initial communities code
2016-12-21 19:30:25 -07:00
LCastr0
dd9729c0f4
and!
2016-12-21 15:55:52 -07:00
LCastr0
e8d698ac37
Fixed eternal taunt
...
Added description for taunts
Added eternal taunt description and icon
Removed minestrike chest for now
Removed debug commans permissions
2016-12-21 15:55:52 -07:00
LCastr0
f2aef9a873
Auto-add item to eternal
2016-12-21 15:55:52 -07:00
LCastr0
dd7f5d7513
Disguise player as skeleton
2016-12-21 15:55:52 -07:00
LCastr0
5102227e94
Added time in ticks where players can't move at the start of the effect
2016-12-21 15:55:52 -07:00
LCastr0
651d0c5966
Changed clocks to be behind player
2016-12-21 15:55:52 -07:00
LCastr0
36801283d7
Added method to disable taunts in certain games
2016-12-21 15:55:52 -07:00
LCastr0
f9c71c481f
Fixed taunts, using armorstands instead of items
...
Removed minestrike chest (not being released this month)
2016-12-21 15:55:52 -07:00
LCastr0
69f7f025a1
Added the first taunt!
2016-12-21 15:55:52 -07:00
LCastr0
e940134610
Removed commented code
2016-12-21 15:55:52 -07:00
LCastr0
99cec0de91
Added pages for the Treasure Chest menu!
2016-12-21 15:55:52 -07:00
LCastr0
e50b867184
Javadocs + option to make taunts usable or not during pvp
2016-12-21 15:55:52 -07:00
LCastr0
0af46005e7
Added Taunts :toot:
2016-12-21 15:55:51 -07:00
LCastr0
56003cccab
Added Minestrike Chests tracking for support
2016-12-21 15:55:51 -07:00
LCastr0
8f50f0d833
Added Minestrike chests (this time to the right branch)
2016-12-21 15:55:51 -07:00
samczsun
7e2c4c8555
Change thresholds, add notifs, move stuff around
2016-12-21 15:55:51 -07:00
samczsun
7f3bb9671a
Change thresholds, add notifs, move stuff around
2016-12-20 15:05:52 -05:00
samczsun
c4c46b6ba2
Add warning if check does not exist
2016-12-20 15:05:26 -05:00
samczsun
fcaf4538bd
Handle multiple bans when ranked TWITCH+
2016-12-20 15:05:26 -05:00
samczsun
63d0481dcf
Fix minor bugs
2016-12-20 15:05:26 -05:00
samczsun
2397cdbba7
Add playerinfo metadata
2016-12-20 15:05:26 -05:00
samczsun
b00d9d7bb4
Prevent punishment abuse
2016-12-20 15:05:26 -05:00
samczsun
383c4d3670
More
2016-12-20 15:05:26 -05:00
samczsun
ece4416c2e
Metadata
2016-12-20 15:05:26 -05:00
samczsun
77f1f18f27
More metadata
2016-12-20 15:05:01 -05:00
samczsun
994d286abe
More logging
2016-12-20 15:05:01 -05:00
samczsun
74f4645828
Ban log
2016-12-20 15:05:01 -05:00
samczsun
6970c3205e
AntiHack Logging
2016-12-20 15:05:01 -05:00
samczsun
77da6ac2c2
Remove MAC
2016-12-20 15:05:01 -05:00
LCastr0
df2b0c7e99
Addef fix for dinnerbone morph not opening menus
2016-12-20 17:16:42 -02:00
Sam
94f8419187
Cashing out and safezones
2016-12-20 16:45:41 +00:00
LCastr0
fd223935c7
Merge branch 'feature/dinnerbone-morph' of github.com:Mineplex-LLC/Minecraft-PC into feature/dinnerbone-morph
2016-12-19 22:15:32 -02:00
LCastr0
06a05080ed
Added YearMonth for Dinnerbone Morph
2016-12-19 22:15:22 -02:00
samczsun
b85bd623f7
Fix not updating skin/tab list
2016-12-19 19:14:28 -05:00
samczsun
eadbb22de9
Dinnerbone Morph with tab list
2016-12-19 17:53:15 -05:00
Sam
9409cbc42c
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2016-12-19 00:32:53 +00:00
samczsun
a6db0170c6
QA Fixes
2016-12-15 20:48:40 -07:00
samczsun
58761a0478
1.8 blocker
2016-12-15 20:48:40 -07:00
samczsun
8421aad59c
Multiversion support (but not used)
2016-12-15 20:48:40 -07:00
samczsun
54f59c6a4d
This is not a bribe
2016-12-15 20:48:40 -07:00
samczsun
de3eef462a
Add Gingerbread Chest to list of holiday chests
2016-12-15 20:48:39 -07:00
samczsun
6ed6c324ec
Update Holiday Cheer Hover
2016-12-15 20:48:39 -07:00
samczsun
d43d82d1ad
Update Leveler tier names
2016-12-15 20:48:39 -07:00
samczsun
908df5a4c2
Make Love Potion call event
2016-12-15 20:48:39 -07:00
samczsun
84132588c2
Give bonus for melons
2016-12-15 20:48:39 -07:00
md_5
e107c0a64a
Pass SQL connection into nested method to prevent deadlock.
...
Discussed with Sam on Slack 11 Dec #general.
2016-12-15 20:46:42 -07:00
William Burns
337f9e4fd9
Don't display titles to 1.8 clients!
2016-12-15 12:36:32 +00:00
cnr
2ab9bc2c88
Fix Power Play title track's goal
2016-12-15 00:44:31 -07:00
cnr
777574a8ff
Add missing dependency to BungeeRotator
2016-12-14 23:23:42 -07:00
samczsun
fd00644eb8
Finalize Titles
2016-12-14 19:56:27 -07:00
samczsun
4641ed828b
Fix faulty scoreboard logic
2016-12-14 19:54:08 -07:00
samczsun
87eaeabd7f
Document and clean up StatsManager
2016-12-14 19:52:13 -07:00
samczsun
d291521ad1
Clean up DonationManager
2016-12-14 19:52:13 -07:00
samczsun
f2fc70f400
Titles
2016-12-14 19:52:13 -07:00
Sam
33ac4f49fd
Some progress
2016-12-13 22:39:38 +00:00
Sam
99b69bd8c8
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2016-12-13 22:39:30 +00:00
Kenny
1b76de9e06
Implement timeout into HTTP calls to prevent freezes
2016-12-12 21:21:06 -05:00
Sam
d0f3aff051
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2016-12-10 11:21:20 +00:00
Sam
6367330021
WorldEvent Base
2016-12-10 11:21:19 +00:00
Sam
6bb76db05b
Helicopter
2016-12-09 18:05:17 +00:00
LCastr0
77a1b40bef
Fixed illuminated chests having gadgets
2016-12-08 20:46:14 -07:00
cnr
b7e738b4e8
Revert commits from #302
...
This reverts commits from the range 062fdd3^..a0beeab
Changes from #302 are on hold until a later date.
2016-12-08 20:41:46 -07:00
Sam
58613fa77f
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2016-12-08 19:42:55 +00:00
Sam
b6173c4990
Google Sheets implementation
2016-12-08 19:25:48 +00:00
LCastr0
38345bfc6d
Add Infused chests #308
2016-12-07 21:42:44 -06:00
Nate Mortensen
a0beeab5ec
Fix Frost Barrier not activating
...
Negative yaw values are considered valid in minecraft.
UtilShapes doesn't correctly handle negative yaw values
(throws an ArrayIndexOutOfBoundsException) so whenever
a player is facing east they're unable to activate Frost
Barrier.
This commit fixes the issue by allowing UtilShapes to take
negative values.
2016-12-07 13:20:04 -06:00
Nate Mortensen
5c363d27fd
Fix item drop check in Wizards
...
Currently players are unable to drop items if the held item
slot is below 5. This works fine when dropping items simply
by pressing q, but it often interferes with players dropping
items from an open inventory. This commit changes the check
to iterate over the first five slots and only cancel the event
if they're dropping one of them.
2016-12-07 13:20:04 -06:00
Nate Mortensen
107fc9d5f6
Fix Blink ability with Spectators
...
When using blink, players are teleported away from other players
within a one block radius of them. However, if a player happens
to have the exact same position(only can occur when a player is
spectating them), division by 0 occurs, resulting in the player
being teleported to NaN, as any operation with NaN is also NaN.
To fix this, Blink now ignores players in Spectator mode. This
change could also address the hypothetical scenario where a
spectator is within the one block radius and results in a blinking
player getting teleported in a weird direction.
2016-12-07 13:20:04 -06:00
Nate Mortensen
66eeae2a54
Run Minestrike in Adventure Mode
2016-12-07 13:20:04 -06:00
Nate Mortensen
ee6e6837ac
Fix the death message when using Summon Wolves
2016-12-07 13:20:04 -06:00
Nate Mortensen
d51d3b2df2
Fix PP-Bizon skin
2016-12-07 13:20:04 -06:00
Nate Mortensen
1a7965a954
Fix kill reward for skinned knives
2016-12-07 13:20:04 -06:00
Nate Mortensen
21ebb2b4c8
Add damage metadata system to CombatLog and CustomDamageEvent
...
This adds a system whereby plugins can associate metadata with individual
damage events and then retrieve that metadata later from the CombatLog.
One example use case for this is Minestrike. Players are rewarded according
to the weapon that they used to kill another player, however the weapons
are frequently renamed. Minestrike can now associate a "gunType" key
to the name of the weapon used to kill the player, regardless of the skin
that the gun currently has applied to it.
2016-12-07 13:20:04 -06:00
Nate Mortensen
a05b53c233
Fix Rumble spell slowness level
2016-12-07 13:20:04 -06:00
Nate Mortensen
0c71d5ef5d
Fix protection provided by Gold armor in Wizards
...
While the name of the gold items is "Golden X", the
name of the material is "GOLD X" resulting in gold items
providing no protective benefit other than the default
vanilla protection(in the case of there being only gold
armor).
2016-12-07 13:20:04 -06:00
Nate Mortensen
fb15264a69
Correct damage for Fireball and AnvilDrop
...
This issue came down to two bugs with the explosions created
by Fireball and AnvilDrop.
The first was the damage being done. Settings the max damage
doesn't change the base damage, so they did the default amount
of damage based on the vanilla code.
The second was the radius of the explosion. The radius was
too small, and so it was perceived that only users directly hit
would suffer damage. The radius was increased, however the block
explosion size was kept the same.
2016-12-07 13:20:04 -06:00
Nate Mortensen
833c52d0f2
Create Lifetime system for managing Listeners with a defined duration.
...
This commit introduces a Component system focused around Games, which is completely
backwards compatible, as well as designed to be flexible enough for later improvements
such as dependency injection. Each GameState is associated with a phase of the
PhasedLifetime that each Game has. Components can be registered with a specific phased
or the entirety of the Lifetime. Refer to the javadocs for Lifetime and PhasedLifetime
for more details. Currently the main two Component types are ICommand and
ListenerComponent.
This commit includes the first refactoring into using this system, which is replacing
the Wizards minigame's usage of Miniplugin with a Lifetimed Component, allowing for
the shop to be appropriately registered and unregistered. This change allows for
Wizards to be run more than once on the same server instance. Previously, attempting
to register the Miniplugin twice would result in the minigame failing to start after
the initial registration.
This commit additionally includes slight refactoring within GameCreationManager as
required for the Lifetime system to function correctly. These changes ensure that
Games are only disabled once, whereas before they could be repeatedly disabled.
The previous implementation of disable(), along with the classes that override it,
functioned correctly despite being called several times.
Finally, this commit adds in changes to the pom to allow for unit testing.
2016-12-07 13:20:04 -06:00
Nate Mortensen
062fdd31b2
Allow spells to be learned from double chests
2016-12-07 13:20:04 -06:00
samczsun
3755424b1c
Botspam QoL improvements
2016-12-07 13:11:00 -06:00
samczsun
20697982e7
Create Rank ScoreboardTag to fix Name collision
2016-12-07 13:05:54 -06:00
samczsun
9234c7a7d5
Implement AddPunishCommand and RemovePunishCommand
2016-12-07 13:05:54 -06:00
Alexander Meech
3af0fe3bee
Add a check for punishment removal permission
2016-12-07 13:05:54 -06:00
Alexander Meech
609d77a4f2
Add a check for whether a player can remove punishments
2016-12-07 13:05:54 -06:00
Sam
05523c1cdf
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2016-12-07 13:36:28 +00:00
Sam
19a214b454
Gem Hunters base
2016-12-06 19:28:23 +00:00
Alexander Meech
1ab800afb8
Remove time portion from scoreboard when ending is reached
2016-12-04 01:59:28 -05:00
Alexander Meech
aa3a8104d2
Toggle reached ending setting on last stage
2016-12-04 01:57:57 -05:00
Alexander Meech
d1a084b66e
Add a reached ending setting to Christmas Chaos
2016-12-04 01:55:46 -05:00
LCastr0
97ce2d0ae6
Gingerbread Cosmetics
...
Adds the following:
- Gingerbread Chests
- Holiday Tree particle
- Freeze Suit
- Winter Warfare win effect
- Present Danger Win Effect
- Gingerbread Man pet
2016-12-01 23:39:33 -06:00
cnr
0ae158726a
Remove last year's 'Massive Winter Sale' news
2016-12-01 03:56:29 -06:00
cnr
795f82d665
Set time to night in the Christmas hub
2016-12-01 03:00:36 -06:00
cnr
fa0e42a918
Revert "Anticheat Logging #299 "
...
This reverts commit cae9d2f67e
.
2016-12-01 01:59:50 -06:00
LCastr0
e503654114
Added lore and icon for the Santa Morph
2016-12-01 01:54:53 -06:00
LCastr0
420a74a33d
Added Santa Morph to the PowerPlay rewards
2016-12-01 01:49:05 -06:00
LCastr0
64949678f8
Added Santa Morph to the menu
...
Disabled spawning Baby Zombie Jockey near water
2016-12-01 01:42:29 -06:00
cnr
cae9d2f67e
Anticheat Logging #299
...
Remove MAC
Add AntiHack Logging
Change thresholds, add notifs, move stuff around
Add warning if check does not exist
Handle multiple bans when ranked TWITCH+
Prevent punishment abuse
2016-12-01 01:24:05 -06:00
AlexTheCoder
df741fd394
Fix UtilVariant and disable Thanksgiving Chickens in Christmas Chaos
2016-12-01 01:22:32 -06:00
AlexTheCoder
e8cc23279f
Start debugging CC
2016-12-01 01:22:32 -06:00
AlexTheCoder
df48369e70
Revamp original Pumpkin King morph, add a new Christmas King Morph, and make the Christmas King morph the new reward for Christmas Chaos
2016-12-01 01:22:32 -06:00
AlexTheCoder
58fe232520
Fix redis pubsub for SalesAnnouncements
2016-12-01 01:20:18 -06:00
AlexTheCoder
72669c7640
Remove malfunctioning visibility refreshers and block direct connection to Clans servers for non-staff
2016-12-01 01:20:18 -06:00
AlexTheCoder
3a7ff872d6
Update Rune Amplifier display to be less confusing
2016-12-01 01:20:18 -06:00
Sam
6d1c368452
Fix no drops
2016-11-30 20:23:45 +00:00
Sam
a7143897a0
Vertical Border and achievements fix
2016-11-30 19:52:27 +00:00
Sam
60c1d747c5
Remove PackMaster Achievement
2016-11-30 17:37:50 +00:00
Sam
bb7191504c
UHC Achievements
2016-11-26 00:40:19 +00:00
Sam
ddab450c8e
Another border size problem...
2016-11-25 00:44:13 -05:00
Sam
f2eb1209db
Wrong border size
2016-11-25 00:44:13 -05:00
Sam
4158d09106
UHC Bug fixes!
2016-11-25 00:44:13 -05:00
AlexTheCoder
6fefd71bb8
Remove all chickens on game state change and stop chickens spawning in any UHC type
2016-11-25 00:41:47 -05:00
AlexTheCoder
26262479f6
Remove Smoke Bomb and Illusion from Clans
2016-11-25 00:41:47 -05:00
cnr
3f72ded65e
Revert "Retry CTF proxy fix"
...
This reverts commit 67a663891e
.
2016-11-24 06:49:26 -06:00
cnr
5e218d019c
Set view distance before loading UHC worlds
2016-11-24 04:50:54 -06:00
Shaun Bennett
f6bf316afb
Update rank colors
2016-11-24 04:58:03 -05:00
Shaun Bennett
4ffe9ef220
Disable UHC in player servers (temporary)
2016-11-24 04:57:21 -05:00
Shaun Bennett
8ffe76c2d0
Fix Bonus Rewards for Omega/Illumination
2016-11-24 02:41:58 -05:00
Shaun Bennett
192273314f
Merge remote-tracking branch 'origin/develop' into develop
...
* origin/develop: (37 commits)
Implement new sales announcement system in Lobbies and ClansHubs, and remove old Unranked Player Manager
Fix SkyWarrior Kit
Undo my report changes
Set up support server with Thankful Chest tracking and Eternal Rank
Add Cake Mount and implement it in Thankful Chest
Use getName() instead of a String
Enable MountChicken with some small modifications and add it to Thankful Chest
Implement Thankful chest, patch Trick or Treat chest showing as purchasable, make SubscriptionDuration enum public and static, and create a Power Play Reward
Remove MCL and OITQP from the stats page
Take a second crack at fixing invisibility across Arcade and Clans
Properly block placement of redstone-based blocks in Clans
Fix Clans servers not restarting every night, display an uptime notification whenever Clans servers shut down for any reason, and remove unnecessary onDisables from the main ClansManager onDisable
Patch Frozen players in clans spawning CombatLog NPCs when leaving, patch ClansCommandExecutedEvent not always being called, clean up ClanBanner code, and make Freeze System and Nether Manager effectively block Clans Commands (particularly teleportation)
Fix game scoreboards breaking when given more than 15 lines and removed OITQ Payload from the server selection compass GUI
Patch Items with type FEATHER, BONE, or RAW_CHICKEN being automatically instantly removed, patch Carl the Creeper not viewing playwire as an available reward to inform players about, and patch Carl the Creeper not informing players of available rewards on Clans Hubs and Lobbies not included in the main server group
Fix HolidayManager being outdated
Update Enderchest endpoint location
Setup enderchest API
QA changes
More bugs
...
2016-11-24 00:51:46 -05:00
AlexTheCoder
be4627812b
Implement new sales announcement system in Lobbies and ClansHubs, and remove old Unranked Player Manager
2016-11-24 00:51:28 -05:00
Shaun Bennett
8d9f697bdd
Fix SkyWarrior Kit
2016-11-24 00:50:03 -05:00
Shaun Bennett
8882bfee5c
Merge remote-tracking branch 'remotes/origin/develop' into update/uhc-moppletop
...
* remotes/origin/develop:
Set up support server with Thankful Chest tracking and Eternal Rank
Add Cake Mount and implement it in Thankful Chest
Use getName() instead of a String
Enable MountChicken with some small modifications and add it to Thankful Chest
Implement Thankful chest, patch Trick or Treat chest showing as purchasable, make SubscriptionDuration enum public and static, and create a Power Play Reward
Remove MCL and OITQP from the stats page
Take a second crack at fixing invisibility across Arcade and Clans
Properly block placement of redstone-based blocks in Clans
Fix Clans servers not restarting every night, display an uptime notification whenever Clans servers shut down for any reason, and remove unnecessary onDisables from the main ClansManager onDisable
Patch Frozen players in clans spawning CombatLog NPCs when leaving, patch ClansCommandExecutedEvent not always being called, clean up ClanBanner code, and make Freeze System and Nether Manager effectively block Clans Commands (particularly teleportation)
Fix game scoreboards breaking when given more than 15 lines and removed OITQ Payload from the server selection compass GUI
Patch Items with type FEATHER, BONE, or RAW_CHICKEN being automatically instantly removed, patch Carl the Creeper not viewing playwire as an available reward to inform players about, and patch Carl the Creeper not informing players of available rewards on Clans Hubs and Lobbies not included in the main server group
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
2016-11-24 00:48:15 -05:00
Shaun Bennett
86591cf4a3
Merge remote-tracking branch 'origin/update/uhc-moppletop' into update/uhc-moppletop
...
* origin/update/uhc-moppletop:
Fix HolidayManager being outdated
2016-11-24 00:15:03 -05:00
Shaun Bennett
b291090ace
Undo my report changes
2016-11-24 00:14:56 -05:00
AlexTheCoder
e85ee39ac5
Set up support server with Thankful Chest tracking and Eternal Rank
2016-11-23 23:43:42 -05:00
AlexTheCoder
a669ac4105
Add Cake Mount and implement it in Thankful Chest
2016-11-23 23:43:42 -05:00
AlexTheCoder
31fd148487
Use getName() instead of a String
2016-11-23 23:43:42 -05:00
AlexTheCoder
c028edb064
Enable MountChicken with some small modifications and add it to Thankful Chest
2016-11-23 23:43:42 -05:00
AlexTheCoder
cfa5512141
Implement Thankful chest, patch Trick or Treat chest showing as purchasable, make SubscriptionDuration enum public and static, and create a Power Play Reward
2016-11-23 23:43:42 -05:00
AlexTheCoder
ca68b59ba2
Remove MCL and OITQP from the stats page
2016-11-23 23:41:10 -05:00
AlexTheCoder
0a458c150f
Take a second crack at fixing invisibility across Arcade and Clans
2016-11-23 23:41:10 -05:00
AlexTheCoder
e4a968759a
Properly block placement of redstone-based blocks in Clans
2016-11-23 23:41:10 -05:00
AlexTheCoder
32c9900069
Fix Clans servers not restarting every night, display an uptime notification whenever Clans servers shut down for any reason, and remove unnecessary onDisables from the main ClansManager onDisable
2016-11-23 23:41:10 -05:00
AlexTheCoder
18992efa5a
Patch Frozen players in clans spawning CombatLog NPCs when leaving, patch ClansCommandExecutedEvent not always being called, clean up ClanBanner code, and make Freeze System and Nether Manager effectively block Clans Commands (particularly teleportation)
2016-11-23 23:41:10 -05:00
AlexTheCoder
c2de8c35e2
Fix game scoreboards breaking when given more than 15 lines and removed OITQ Payload from the server selection compass GUI
2016-11-23 23:41:10 -05:00
AlexTheCoder
1bbabe46f7
Patch Items with type FEATHER, BONE, or RAW_CHICKEN being automatically instantly removed, patch Carl the Creeper not viewing playwire as an available reward to inform players about, and patch Carl the Creeper not informing players of available rewards on Clans Hubs and Lobbies not included in the main server group
2016-11-23 23:41:10 -05:00
AlexTheCoder
44efedbc81
Fix HolidayManager being outdated
2016-11-23 19:11:44 -05:00
Shaun Bennett
15f3b19f8a
Merge remote-tracking branch 'origin/update/uhc-moppletop' into update/uhc-moppletop
...
* origin/update/uhc-moppletop:
Retry CTF proxy fix
Eternal Giveaway Fixes
Eternal giveaway refactoring
Revert: Disable Fated giveaway tools for now
Eternal Rank
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java
2016-11-23 18:11:26 -05:00
Shaun Bennett
bfa27f2bc4
Update Enderchest endpoint location
2016-11-23 18:10:59 -05:00
xXVevzZXx
b42f3eb5fd
Fix final bugs and improve island system
2016-11-23 19:56:46 +01:00
Shaun Bennett
e892476ca0
Setup enderchest API
2016-11-22 08:17:24 -05:00
Sam
325c0ab56c
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop
2016-11-21 19:13:34 +00:00
Sam
92ed095e92
QA changes
2016-11-18 21:32:02 +00:00
Shaun Bennett
dd7e559a37
Merge remote-tracking branch 'origin/develop' into develop
...
* origin/develop:
Retry CTF proxy fix
Eternal Giveaway Fixes
Eternal giveaway refactoring
Revert: Disable Fated giveaway tools for now
Eternal Rank
2016-11-17 22:50:23 -05:00
samczsun
67a663891e
Retry CTF proxy fix
...
But this time, let's allow deregistration even if it hasn't been
registered by us, because it auto-registered itself
2016-11-17 22:49:15 -05:00
Shaun Bennett
3d5e61e0f1
Eternal Giveaway Fixes
2016-11-17 21:05:10 -05:00
Shaun Bennett
562d7de1a9
Eternal giveaway refactoring
2016-11-17 21:05:10 -05:00
Shaun Bennett
cdfd030999
Revert: Disable Fated giveaway tools for now
2016-11-17 21:05:10 -05:00
Shaun Bennett
712019b45b
Eternal Rank
2016-11-17 21:05:10 -05:00
Shaun Bennett
c080d41dc2
Temp DB fixes
2016-11-17 19:08:32 -05:00
xXVevzZXx
85d6452432
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/skyfall
2016-11-17 23:17:24 +01:00
Sam
0ca79f193f
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop
2016-11-17 21:20:28 +00:00
Sam
53b67214fb
More bugs
2016-11-17 21:20:00 +00:00
Shaun Bennett
f6a694b4fc
Fix Metal Man distribution
2016-11-17 16:18:51 -05:00
Shaun Bennett
10911c9a9c
Revert CTF Proxy Fix
2016-11-17 16:17:39 -05:00
Sam
142cf4dd93
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop
2016-11-17 19:41:47 +00:00
Sam
78a123156a
Memory leaks!
2016-11-17 19:38:07 +00:00
xXVevzZXx
26d8fe5e6e
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/skyfall
2016-11-17 19:19:28 +01:00
Shaun Bennett
e845f7fca9
Disable Fated giveaway tools for now
2016-11-17 02:13:48 -05:00
LCastr0
b862a30c76
Thanksgiving Cosmetics ( #278 )
...
* Added chickens to Holiday Manager (Thanksgiving)
Added TextEffect
Moved all the effects to a different package to make it easier to find
Added method in Effect to get the Effect Location
* Removed(?) wildcard import
* Testing New year thing
Added some symbols to UtilBlockText
* Allow multiple pets with the same EntityType
* Added Stray Morph
Added Shulker Pet
Added code for a possible new year effect
Added Metal Man Morph to the menus
Added Metal Man Morph as an yearly bonus for PPC subscriptions
* Added chickens to Holiday Manager (Thanksgiving)
Added TextEffect
Moved all the effects to a different package to make it easier to find
Added method in Effect to get the Effect Location
* Removed(?) wildcard import
* Testing New year thing
Added some symbols to UtilBlockText
* Allow multiple pets with the same EntityType
* Added Stray Morph
Added Shulker Pet
Added code for a possible new year effect
Added Metal Man Morph to the menus
Added Metal Man Morph as an yearly bonus for PPC subscriptions
* I seriously don't remember what is in this commit, I'm just doing it to
fix the thing with develop...
* Fixed Pet menu
Fixed morph menu
Changed from List to Set
* Changed from PurchasUnknownSalesPackage to AddUnknownSalesPackageOwned
* Added Santa Morph
Removed Sleigh Morph
Changed all the cosmetics GUIs to start on the second row, instead of the first
* Changed some stuff from Holiday Manager so now chickens will walk around when spawned
* Added sound effects to Metal Man
Added slowness to Metal Man
* Added new lore for the Metal Man Morph description
Added Stray Morph Ability
Fixed some problems with the Thanksgiving Chickens
* Added Fated giveaway manager and animation
Moved titan and fated giveaway managers to a new package
* Fixed lores for Stray morph and Shulker pet
Changed ability of Stray morph
* Removed Stray and Shulker pet from the menu
Deleted Pet class since it was not being used
Changed position of achievement on the menu
Changed color of chicken's name
Changed colors of Power Play message
Stray morph, Santa morph and Shulker pet are hidden from the menus for now
Removed feathers dropping from chickens, changed them to snow particles
* Added hover ability to Metal Man Morph
* Fixed some stuff on Metal Man
2016-11-17 02:06:00 -05:00
cnr
db1598f896
Revert 1.11 disguise changes
...
Entity type tracking for disguises is now done in our spigot build.
2016-11-16 23:36:47 -06:00
Shaun Bennett
cbc9aeedc6
Report Feature Improvements ( #269 )
...
Report Feature Improvements
2016-11-16 22:52:14 -05:00
Shaun Bennett
c250796bdf
Fix pom.xml formatting
2016-11-16 22:37:25 -05:00
AlexTheCoder
7d14b6073d
Give SlackAPI a valid payload link, fix some display issues with clans nether, fix claiming in clans nether, update coordinates to match new map
2016-11-16 22:37:25 -05:00
AlexTheCoder
5e1fcabe36
Final changes for S2
2016-11-16 22:37:25 -05:00
AlexTheCoder
a8e3a530c1
Prevent safely logging out in shop zones while tagged
2016-11-16 22:37:25 -05:00
AlexTheCoder
4a186a8dec
Disable crafting of hoppers
2016-11-16 22:37:25 -05:00
AlexTheCoder
4fc2b875d4
Add a clans map generator to codebase
2016-11-16 22:37:25 -05:00
AlexTheCoder
a219a2d072
Fix TNT breaking bedrock, increase build height and add a minimum chest place height
2016-11-16 22:37:25 -05:00
AlexTheCoder
1535fcc38b
Fix temp blocks in unloaded claims not restoring, fix ClassCombatCreatureSpawnEvent having a null world name, fix block toss fallingblocks solidifying in unloaded chunks, make safelog in clans disable when server shuts down, and make UtilBlock recognize 1.8 fence gates as usable blocks
2016-11-16 22:37:25 -05:00
AlexTheCoder
63ef68976c
Patch illusion in nether, stop cobble generation, lower rune drop rate, make tnt time based and better function in water, make scorching not damage teammates or those in safezones, make runed pickaxe more effective
2016-11-16 22:37:25 -05:00
Sam
22b7ce60eb
For sam
2016-11-17 02:56:58 +00:00
Alexander Meech
c21e71606d
Fix message line spacing for Prince Artix
2016-11-16 21:42:47 -05:00
AlexTheCoder
b374d728f5
Change playwire button, modify player messages, and fix availability bugs
2016-11-16 21:42:47 -05:00
AlexTheCoder
0070fed6c7
Fix playwire multithreading and convert to new 5-ticket per 24-hour system
2016-11-16 21:42:47 -05:00
AlexTheCoder
824ef685c0
Add missing return
2016-11-16 21:42:47 -05:00
AlexTheCoder
d5f89bb370
Add more blocked commands and move the blocked command handler below the Mineplex command executor
2016-11-16 21:42:47 -05:00
AlexTheCoder
4cb257e84a
Tweak blocked commands system
2016-11-16 21:42:47 -05:00
Sam Sun
4709161180
Attempt to fix CTF Proxies ( #280 )
2016-11-16 21:40:42 -05:00
md-5
735550c157
Use Mineplex Pair Util Class in Halloween 2016 ( #274 )
...
JavaFX is not included in OpenJDK.
2016-11-16 20:29:33 -05:00
Shaun Bennett
0039b79281
Change Youtube Button Link ( #275 )
...
* Fix possible NPE in Preferences
* Change youtube button link
2016-11-16 20:23:14 -05:00
Sam
8d6eb13504
Add "%player% is your teammate" in 2 player team games ( #273 )
...
* Add "%player% is your teammate" in 2 player team games
* Add to Team Skyfall
2016-11-16 20:10:16 -05:00
Sam
684432d7dc
Add Rules Command ( #272 )
...
* Added a /rules command
* Remove unused space
* More Spaces!
2016-11-16 19:59:24 -05:00
Sam
51c7801a9f
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop
2016-11-15 20:01:21 +00:00
cnr
70ca2c7964
Add 1.11 support
2016-11-15 13:58:31 -06:00
xXVevzZXx
a74bc71018
fix bugs and make some improvements
2016-11-15 17:04:38 +01:00
Sam
faba1f2369
Forgot the actual UHC class...
2016-11-13 12:35:48 +00:00
Sam
efc73d220f
Change how UHC handles time
2016-11-13 12:35:38 +00:00
Sam
07cd716cf7
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop
2016-11-13 10:37:21 +00:00
Sam
aa4ef9f4ad
Big bugs
2016-11-12 21:50:38 +00:00
Keir Nellyer
6e5db69b0c
Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report
2016-11-10 13:52:44 +00:00
Sarah
e71187aa33
Add new Brawl Games ( #260 )
...
* add more Brawl games
* fix some bugs in new brawl games
* fix even more bugs
* Fix some super paintstrike bugs
* Add some Javadoc
2016-11-09 20:38:49 -05:00
Keir Nellyer
af7557c9b1
When multiple accounts with the same name occur, pick the one that
...
logged in most recently
2016-11-09 01:25:33 +00:00
Nate Mortensen
3b83a9bdc3
Reformat Block Hunt
2016-11-08 10:44:39 -05:00
Nate Mortensen
6db79c3ca5
Remove disguises when players switch to Seeker
2016-11-08 10:44:39 -05:00
Nate Mortensen
0607355ee0
Prevent cloaked players from having their visibility reset
2016-11-08 10:44:39 -05:00
Nate Mortensen
e3b701f948
Don't give infestors an initial disguise
2016-11-08 10:44:39 -05:00
Keir Nellyer
6273996ebe
Only set incognito and teleport player when report is hacking or
...
gameplay offense
2016-11-07 15:38:55 +00:00
Sam
6a9648e646
Solo Mode and Faster UHC
2016-11-05 11:06:12 +00:00
xXVevzZXx
af7de62ff7
Fix non upgradeable perks being not unregistered
2016-11-04 06:02:13 -05:00
Keir Nellyer
407ec0d924
Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report
2016-11-03 20:11:21 +00:00
xXVevzZXx
d93cdfee8f
Add Team stats display for Skyfall
2016-11-02 21:42:53 -05:00
Nate Mortensen
f587445ffc
Remove extraneous horses when the game ends
...
When players using the horseman kit win a game,
they never die, which is the only time that spawned
horses are removed. To fix this, at the end of the
game all horses belonging to players that have survived
are explicitly removed, which removes all remaining horses.
2016-11-02 17:01:17 -04:00
LCastr0
9267a36528
Disable Halloween 2016 ( #261 )
...
* Removed all the halloween related items:
- Haunted chests can only be opened if player already had ammo
- Removed Halloween theme from the hub
- Removed pumpkins from in-game
* Added Halloween items to the Omega Chest
* Fixed weight for items in the omega chest
* Changed Disk to Disc in RewardManager
Changed values for omega rarities
* Final commit (removed win room test command)
* Removed Halloween words from Draw My Thing and Master Builders
2016-11-02 16:49:31 -04:00
Sarah
afac2aea3f
Skyfall Update ( #262 )
...
* Fix some bugs, improve Skyfall and add Skyfall Teams
* re-enable debug
* Fix Perks not being unregistered from the EventHandler
* Remove unused import
* Remove unused imports
2016-11-02 16:48:44 -04:00
Sam
b122fba97e
Fix arrows not getting removed!
2016-11-02 16:48:01 -04:00
Alexander Meech
1f69c204f6
Fix Trick or Treat Chest Logging in Cust Server
2016-11-02 16:47:38 -04:00
Alexander Meech
e73947b9b1
Hotfix pumpling pet being added to Haunted Chest
2016-11-02 16:47:38 -04:00
Keir Nellyer
aaa248833e
Don't allow players to have more than 5 open snapshots at a time
2016-11-01 17:21:56 +00:00
Keir Nellyer
828f39536b
Don't allow players to have more than 5 open reports at a time
2016-10-31 15:49:15 +00:00
Keir Nellyer
b5ef642f39
Improve getReportHandling code
2016-10-30 22:13:52 +00:00
Keir Nellyer
4971adcfb3
This should be an inner join
2016-10-30 01:53:52 +00:00
Keir Nellyer
e72573d6fd
Fix getReports method not checking report cache first
2016-10-30 01:41:28 +00:00
Keir Nellyer
8f07d377f1
Clear report cache after closing message has been sent, prevents
...
report cache being cleared and instantly reloaded
2016-10-30 01:25:06 +00:00
Keir Nellyer
1405aef0c3
Update code to use column creatorId
instead of creator
2016-10-30 01:16:40 +00:00
Keir Nellyer
08f113bb99
Various improvements and fixes to report related database queries
2016-10-30 01:58:56 +01:00
Keir Nellyer
ce4672f026
Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report
2016-10-29 15:54:13 +01:00
Keir Nellyer
7aa3daca9d
PC-1140 Fix various issues with region-locked reports
2016-10-29 15:54:01 +01:00
Keir Nellyer
696a99b872
Refactor some parameter names to make method function more obvious
2016-10-29 15:26:02 +01:00
Keir Nellyer
3dc441d61d
PC-1016 Delete snapshots > 30 days and not linked to report in
...
cleanup task
2016-10-29 14:38:16 +01:00
Keir Nellyer
09e5d13b96
PC-1016 Rename column creator
to creatorId
2016-10-29 14:27:19 +01:00
Keir Nellyer
eb37c5da2e
PC-1016 Create column created
to store date time for snapshots
2016-10-29 14:26:16 +01:00
samczsun
07c93606f8
GameChatManager: Check if the game exists
2016-10-28 17:57:25 -04:00
samczsun
873e93747e
HolidayManager: Fix CME
2016-10-28 17:57:25 -04:00
samczsun
49c5df6e68
Parties: Check if target is null before inviting
2016-10-28 17:57:25 -04:00
samczsun
1d961c7d81
GamePlayerManager: Don't load kits if offline
2016-10-28 17:57:25 -04:00
samczsun
a7986a0719
Party: Fix NPE
...
Filter out members who are no longer online when sending messages
2016-10-28 17:57:25 -04:00
samczsun
d2a2fdfd46
UHC: Fix NPE
...
Players who joined after the gamestate has been set to PREPARE
should not be considered as in the game
2016-10-28 17:57:25 -04:00
samczsun
a729b03ce7
UtilParser: Handle null lastDamageCauses
2016-10-28 17:57:25 -04:00
samczsun
0c1f6cbedc
Rewrite CombatLogModule
2016-10-28 17:57:25 -04:00
samczsun
70ed2e4fbb
CompassModule
...
Integrate with CombatLogModule
2016-10-28 17:56:46 -04:00
samczsun
e8becf3819
Op on dev servers too
2016-10-28 17:56:08 -04:00
samczsun
e7b744f527
UHC rewrite
2016-10-28 17:56:08 -04:00
Keir Nellyer
f0f01b74e8
PC-1016 Schedule cleanup task for everyday at 00:00 CDT
2016-10-28 18:13:20 +01:00
samczsun
7a0fba3027
Make Trick Or Treat chests open 4
2016-10-28 00:10:17 -05:00
Keir Nellyer
4b3cadbb5a
Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/BuyChestButton.java
2016-10-27 23:53:32 +01:00
Keir Nellyer
8283af25af
Remove resolved todo for metrics command
2016-10-27 23:49:40 +01:00
Keir Nellyer
e7ff175eff
Remove report site token todo message (is now resolved)
2016-10-27 23:48:54 +01:00
Keir Nellyer
30f56e3b12
PC-1016 Add cleanup task sql script
2016-10-27 23:40:09 +01:00
Keir Nellyer
100dc53ead
PC-1150 Close div's correctly
2016-10-27 16:09:11 +01:00
Keir Nellyer
3bcfa6adc5
PC-1150 Only show information section of site when report is being
...
displayed
2016-10-27 15:34:07 +01:00
Shaun Bennett
577e640f4a
Add KillAura Type E and F checks - no Action enabled yet
2016-10-26 23:00:47 -04:00
Shaun Bennett
0c0ad5ab13
PPC Items ( #252 )
...
Update/ppc items
2016-10-26 22:30:58 -04:00
LCastr0
a340f15d63
Fixed changes requested by Shaun
2016-10-27 00:27:50 -02:00
Shaun Bennett
f06325d972
Super Smash Mobs Update ( #243 )
...
Update/ssm
2016-10-26 22:03:43 -04:00
Alexander Meech
d13387df52
Make trick or treat chest dynamically controlled ( #256 )
...
* Implement trick or treat chest in customer support server
* Add several new reward types, implement trick or treat chest and all its animations, and fix playwire nested threads
2016-10-26 22:02:46 -04:00
Keir Nellyer
3bd575b718
PC-1153 Improve /reportmetrics usage
2016-10-26 13:29:11 +01:00
Keir Nellyer
79b5439aa4
Small refactoring
2016-10-26 10:50:49 +01:00
Keir Nellyer
a97ad8dd76
PC-1153 Don't allow days argument to exceed 30 days
2016-10-26 10:42:10 +01:00
Keir Nellyer
f5a81f083e
Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report
2016-10-26 10:28:13 +01:00
Keir Nellyer
52d001c26e
PC-1153 Add /reportmetrics command
2016-10-26 10:28:01 +01:00
Alexander Meech
39f0cd79bb
Cap purchase date for sampson
2016-10-25 13:34:22 -04:00
Alexander Meech
3e8eecdf91
Update reward weightings for sigils
2016-10-25 13:34:22 -04:00
Alexander Meech
6d982f3df9
Fix spin ticket reward threading
2016-10-25 13:34:22 -04:00
Alexander Meech
273f95f8ff
Fix playwire threading
2016-10-25 13:34:22 -04:00
AlexTheCoder
a36ebf4528
Add several new reward types, implement trick or treat chest and all its animations, and fix playwire nested threads
2016-10-25 13:34:22 -04:00
AlexTheCoder
ab228fb492
Implement trick or treat chest in customer support server
2016-10-25 13:34:22 -04:00
cnr
44e016f272
Fix infinite loop in GameWorldManager
2016-10-25 01:44:07 -05:00
Keir Nellyer
e4c7e31185
Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report
2016-10-24 15:00:10 +01:00
Alexander Meech
d6dc750ece
Prevent MPS servers with Lobbyblablabla-1 as...
...
...the name from being loaded as an applicable lobby server
2016-10-24 01:21:56 -04:00
xGamingDudex
eaee382e7f
Small typo
2016-10-23 16:22:27 +02:00
xGamingDudex
c0ec1e1ff7
Prevent infinite speed effect on creeper
2016-10-23 03:11:51 +02:00
xGamingDudex
7b7b7aadf8
Fix a notorious XP bug in the wolf kit
2016-10-23 01:28:57 +02:00
xGamingDudex
1a847862d5
Prevent sometimes duplicate usage of the snowman smash
2016-10-23 01:28:04 +02:00
xGamingDudex
4531902adc
Prevent guardian abilities from affecting team mates
2016-10-23 01:27:34 +02:00
xGamingDudex
0306d0d9d1
Fix chicken rocket to deal damage and knockback
2016-10-23 01:27:09 +02:00
Keir Nellyer
ff8f77f8d1
Rename these variables to make better sense
2016-10-22 23:08:59 +01:00
Keir Nellyer
ecd9dfef1a
PC-1139 Update chatsnap site to support displaying of snapshots with
...
no associated report
2016-10-22 20:49:14 +01:00
xGamingDudex
2d0d78e1b7
Prevent snowman smash from affecting self, and give 3 snowmen
2016-10-22 21:28:11 +02:00
Keir Nellyer
c6ca976653
PC-1139 Add /chatsnap command
2016-10-22 20:23:31 +01:00
Keir Nellyer
81bf9bc406
Small method rename
2016-10-22 19:21:38 +01:00
Keir Nellyer
35048b46a7
Report/snapshot code clean-up
2016-10-22 19:17:20 +01:00
Keir Nellyer
e0d05d3c87
PC-1140 Keep reports region-separated
2016-10-22 15:06:18 +01:00
xGamingDudex
295f1f255f
Fixed rare NPEs
2016-10-22 13:09:56 +02:00
xGamingDudex
720e965d08
Fixed chicken rocket.
2016-10-22 10:49:21 +02:00
xGamingDudex
4e433665cc
Fixed golem smash affecting team mates
2016-10-22 10:49:02 +02:00
xGamingDudex
8414a17978
Don't apply velocity to team mates
2016-10-22 10:48:36 +02:00
xGamingDudex
d2be1fc646
Don't set team mates on fire on direct fireball hit
2016-10-22 10:48:09 +02:00
xGamingDudex
1ae89adfb0
Remove debug messages
2016-10-22 09:40:06 +02:00
LCastr0
6de2df5cc4
Fixed lores
...
Fixed icons
Removed sleigh, chicken mount and wind up suit from menus
Added javadocs to sleigh
2016-10-22 02:27:44 -02:00
LCastr0
83ba1cb26e
- Removed debug message
...
- Added check for player teleport when opening a chest
- Added Turkey Morph and Chicken Mount to PowerPlayClubRewards
2016-10-21 18:48:47 -02:00
LCastr0
0d6ff42a8d
- Fixed players not being kicked from treasure chest locations when they are being opened
...
- Increased the time needed for the Wind Up suit to be charged
- Added effect for the Wind Up suit to blink between yellow and red when the effect is active
2016-10-21 18:06:13 -02:00
Keir Nellyer
5f755add78
Rename /reportstats command to /reporthistory
2016-10-21 17:24:27 +01:00
LCastr0
56db128730
Merge pull request #251 from Mineplex-LLC/develop
...
Merge 'develop' into 'update/ppc-items'
2016-10-21 13:05:00 -02:00
xGamingDudex
cfd2343f0e
Fixed zombie perk Deaths Grasp
2016-10-21 16:51:47 +02:00
xGamingDudex
b8c474a92d
Fixed daze potion
2016-10-21 16:51:29 +02:00
xGamingDudex
bcfdfd4619
Added better team mate detection for team super smash
2016-10-21 16:51:16 +02:00
Keir Nellyer
b0ac3cac8c
Show link to view chat log in /reportinfo
2016-10-21 09:32:11 -04:00
Keir Nellyer
63514029f2
Generate missing tokens for snapshots on report load
2016-10-21 09:32:11 -04:00
xGamingDudex
ff1d29bd2e
Apply wool bomb damage to self in team games
2016-10-21 01:37:14 +02:00
xGamingDudex
70d554fa2d
Fixed witch daze potion
2016-10-21 01:12:02 +02:00
xGamingDudex
ca0f36d142
Prevent armorstand used by laze to block projectiles
2016-10-21 00:55:44 +02:00
xGamingDudex
45c5ba66bd
Prevent multiple perks from affect team mates and cleaned up some code
2016-10-21 00:55:18 +02:00
xGamingDudex
c8edc2d01e
Rewrote daze potion damage calculations
2016-10-21 00:54:04 +02:00
xGamingDudex
6a6a589cb7
Fixed wolf cub sometimes not being removed
2016-10-21 00:25:37 +02:00
xGamingDudex
db3106d8a4
Prevent golem fissure from effecting team mates
2016-10-20 23:20:26 +02:00
xGamingDudex
d26103d321
Increase Whirlpool damage
2016-10-20 23:20:02 +02:00
xGamingDudex
d42a5f1897
Prevent Chicken Rocket from resetting cooldown when hitting team mates
2016-10-20 23:13:32 +02:00
xGamingDudex
08b7b7cb48
Removed unused files. Move wool bomb patch to correct file
2016-10-20 23:11:55 +02:00
xGamingDudex
7ad0b214a5
Change team display text
2016-10-20 23:08:40 +02:00
xGamingDudex
be2bc09896
Added comma to laser text
2016-10-20 22:56:12 +02:00
xGamingDudex
875bdc1fca
Removed unused code
2016-10-20 22:50:12 +02:00
xGamingDudex
d119a94d53
Fixed concurrency issue
2016-10-20 22:44:43 +02:00
xGamingDudex
4e4fd2a8e9
Changed respawn title text
2016-10-20 22:44:13 +02:00
xGamingDudex
0705e38b3e
Fixed NPE
2016-10-20 22:43:51 +02:00
Shaun Bennett
f8010f4ad0
Merge pull request #245 from Mineplex-LLC/update/report-improvements
...
Report Feature Improvements
2016-10-19 22:53:53 -04:00
samczsun
bafad1189b
ProgressingKitManager: Temporarily add finally
2016-10-19 22:38:39 -04:00
samczsun
38ef65c32e
Fix memory leak in ItemSnowball
2016-10-19 22:38:39 -04:00
samczsun
2ed03147b0
Make WinEffectGadget clean up even if exceptions occur
2016-10-19 22:38:39 -04:00
samczsun
5168044be5
Fix memory leak in WinEffectHalloween
2016-10-19 22:38:39 -04:00
samczsun
d2c0b34459
PlayerMap
2016-10-19 22:38:39 -04:00
samczsun
09fe7b736a
Don't enable debugging
2016-10-19 22:38:39 -04:00
samczsun
bcb56c50f5
Fix memory leak in AntiHackGuardian
2016-10-19 22:38:39 -04:00
samczsun
25d6a4239e
Fix memory leak in StatsManager, CombatManager
2016-10-19 22:38:39 -04:00
samczsun
2b6d7a4d7a
Fix memory leak in ParticleFairy
2016-10-19 22:38:39 -04:00
samczsun
a59dde44c6
Remove recharge data on quit instead of later
2016-10-19 22:38:39 -04:00
samczsun
19eeae7f7f
Fix memory leak in ParticleFoot
2016-10-19 22:38:39 -04:00
samczsun
6f80e21372
Fix memory leak in carl, server
2016-10-19 22:38:39 -04:00
samczsun
bd9aa38afa
Make DisguiseManager clean up after lazy callers
2016-10-19 22:38:39 -04:00
samczsun
a338fb27d3
Various memory leak fixes
2016-10-19 22:38:39 -04:00
samczsun
b3ed9db2c7
Fix memory leak in ProgressingKitManager
2016-10-19 22:38:39 -04:00
samczsun
c00502d91f
Fix memory leak in WinEffectPodium
2016-10-19 22:38:39 -04:00
samczsun
894e6b4a89
Fix memory leak in CombatLogNPC
2016-10-19 22:38:39 -04:00
samczsun
0cbd4a9de2
Fix memory leak in Teleport
2016-10-19 22:38:39 -04:00
samczsun
dbd5203e9d
Fix memory leak in ParticleFreedom
2016-10-19 22:38:39 -04:00
AlexTheCoder
6719f11358
Fix playwire command not requiring console to use it
2016-10-19 22:36:03 -04:00
AlexTheCoder
13220e267c
Re-enable animation
2016-10-19 22:36:03 -04:00
AlexTheCoder
16b195d2ab
Make playwire-given carl spin tickets update while the player is logged in
2016-10-19 22:36:03 -04:00
AlexTheCoder
2e280d62de
Block rain on the support server
2016-10-19 22:35:17 -04:00
AlexTheCoder
6d9d42cfdd
Allow pets to be given from the support server
2016-10-19 22:35:17 -04:00
Alexander Meech
60fad6316b
Ensure command used is actually /pumpkin
2016-10-19 20:59:12 -04:00
AlexTheCoder
26baf6aa67
Make Halloween pumpkins actually drop gems and shards in Block Hunt and Minestrike
2016-10-19 20:59:12 -04:00
AlexTheCoder
55b37e0261
Fix players being able to log in multiple times via different bungees
2016-10-19 20:58:05 -04:00
xGamingDudex
db9f358718
Increase Angry Heard durration
2016-10-20 02:01:40 +02:00
xGamingDudex
59712b4089
Prevent multiple abilities from dealing damage and knockback on teammate
2016-10-20 02:01:23 +02:00
xGamingDudex
21d004b3f2
Make the skelleton kit deal static 6 damage for arrows
2016-10-20 02:00:30 +02:00
xGamingDudex
6851a20e92
Fix /lives debug command
2016-10-20 02:00:01 +02:00
xGamingDudex
0d688534b1
Reduce slime smash durration
2016-10-20 01:28:25 +02:00
xGamingDudex
33a7deed58
Tweaked witch daze potion damage
2016-10-20 01:27:43 +02:00
xGamingDudex
74d6c599b5
Fixed snowman turret targeting team mates
2016-10-20 01:27:22 +02:00
xGamingDudex
82f1ec1ac6
Tweaked spider smash
2016-10-20 01:01:46 +02:00
xGamingDudex
2306dbc909
Fixed creeper XP
2016-10-20 01:01:31 +02:00
LCastr0
225f5c6b7c
Internal:
...
- Removed Win room test command
- Fixed spelling error in MountSpider
- Changed MountChicken so it can now jump
- Still working on the Sleigh morph
- Added Wind Up Suit for testing
- Removed unused code from MountSpider
External:
- Added Sleigh Morph (Still need some work on it)
2016-10-19 18:44:57 -02:00
xGamingDudex
8de69d2573
Fixed guardian passive to acctually work
2016-10-19 17:49:59 +02:00
xGamingDudex
0b02bc9e2d
Fixed with daze potion self damage and only randomly working
2016-10-19 16:35:49 +02:00
xGamingDudex
9e3cf58ff5
Type in blaze smash
2016-10-18 19:39:06 +02:00
Keir Nellyer
db0bfece23
Prevent re-saves from un-aborting user reports
2016-10-16 23:23:55 +01:00
Keir Nellyer
3db7e27ecd
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/report-improvements
2016-10-15 15:23:26 +01:00
xGamingDudex
35c9d2ecb1
Tweaked damage/KB values and fixed text issues
2016-10-15 14:56:38 +02:00
Keir Nellyer
1ab646bbda
Fix error message colouring when there are no reports to handle
2016-10-14 19:14:50 +01:00
Keir Nellyer
64bb01c92f
Move /reportabort functionality over to the /reportclose gui
2016-10-14 19:14:35 +01:00
Keir Nellyer
28603ec8c5
Remove resolved TODOs
2016-10-14 18:47:25 +01:00
Keir Nellyer
4b4dc74cbf
PC-1000 Token column is now 8 characters
2016-10-14 16:29:04 +01:00
Keir Nellyer
b6bda9418d
PC-1000 Make all token related things work together
2016-10-14 16:28:42 +01:00
cnr
8e7ae7f55f
Make Power Play status clearer on support server
2016-10-14 00:26:33 -05:00
cnr
8ebad90f52
Don't lock current month's cosmetic on resub day
...
This fixes an issue where a player might lose the current month's
cosmetic on the date of resubscription until his/her payment method was
charged
2016-10-14 00:26:33 -05:00
cnr
0e5d8cc785
Replace pumpling spawn flicker with short glow
2016-10-14 00:25:55 -05:00
Keir Nellyer
3b7169ad3d
PC-1000 Implement token generating method
2016-10-14 01:14:51 +01:00
Sam
76a413548b
More unused imports
2016-10-13 23:31:32 +01:00
Sam
4810960d82
Stop visible armorstands
2016-10-13 23:19:11 +01:00
Sam
99c72a3b31
Fix debug command
2016-10-13 23:10:59 +01:00
Sam
e698037a73
Remove unused import
2016-10-13 22:44:48 +01:00
Sam
c93e6be98b
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm
2016-10-13 22:43:08 +01:00
Sam
ca0da15b8c
Fix magma cube
2016-10-13 22:43:04 +01:00
Sam
f72f6e8aaa
Tweaks
2016-10-13 20:20:00 +01:00
Sam
a5d52d9e2f
MERGE PLEASE!
2016-10-13 16:11:01 +01:00
Shaun Bennett
8974b2b395
Fix Carl Error
2016-10-13 04:07:05 -04:00
Shaun Bennett
bb32a06caf
Add Halloween Words
2016-10-12 23:30:52 -04:00
AlexTheCoder
7ec530a8c7
Fix lobby protection on build server, make map locks persistent, implement larger parsing size, make map lock command require op, prevent raining on build server, and make block hunt actually work with any map with required information regardless of order
2016-10-12 23:01:25 -04:00
Shaun Bennett
62d08e74e3
Remove voting code
2016-10-12 22:54:14 -04:00
Alexander Meech
87122e9904
Update youtube link
2016-10-12 22:54:14 -04:00
Alexander Meech
63c14a99ab
Update playwire displayed cooldown time
2016-10-12 22:54:14 -04:00
AlexTheCoder
6d36034115
Remove voting from carl the creeper, move spin tokens to playwire, unify link messages in all carl the creeper links
2016-10-12 22:54:14 -04:00
xADudex
311751cc39
Pumpkin's Revenge ( #237 )
...
* Initial Commit
* Update
* Bunch of new stuff
* Fixed fletcher arrow typo
* Added reward pet, fixed typo, tweaked lose cinematic
* Lots of tweaks and fixes with QA
* Cleaning up a little code
* Removed debug message on prince death
* Added nighttime to halloween game lobby maps
* Tweaked spawn rates and mob caps
* Typo
* Tweaked texts, cleaned import and cleared all mobs from boss cinematic
* Fixed creepers not getting properly removed during boss cinematic
* Reward typo
* Fixed rare NPE
* Typos
* Tweaked mini zombie
* Typo
* Prevent zombie from spawning minis after being removed
* Tweaked wave announcements + formated WaveVictory
* Changed color of prince tag + formated ZombieSpawner
* Fixed (another) rare NPE
* Tweaked boss wave cinematic
2016-10-12 22:40:05 -04:00
AlexTheCoder
66dfe06b34
Clean up bucket fixing in clans
2016-10-12 21:50:18 -04:00
AlexTheCoder
2ac7f72327
Fix clans water exploit and ruined pickaxe duping exploit
2016-10-12 21:50:18 -04:00
Keir Nellyer
03e219f552
Add header to /reportstats and further improvements
2016-10-13 02:15:49 +01:00
Keir Nellyer
2e16eef5d9
Make /reportstats work with offline players and other small improvements
2016-10-13 01:18:23 +01:00
Keir Nellyer
76539648da
PC-1109 Fix /reportstats if player doesn't have at least 5 reports in
...
each role
2016-10-12 17:36:54 +01:00
Keir Nellyer
ca09253292
PC-954 Tweak error message when no reports are available for handling
...
Also close gui after clicking item and remove old un-necessary code.
2016-10-12 17:30:19 +01:00
Keir Nellyer
f42678a9ef
PC-954 Fix incorrectly sized inventory
2016-10-12 17:23:42 +01:00
Keir Nellyer
eb6d893414
PC-954 Allow staff to select what kind of report they'd like to handle
2016-10-12 17:15:48 +01:00
Keir Nellyer
15cf3a2bee
PC-1019 Give indication of when a report is forwarded to a team
2016-10-11 14:30:43 +01:00
Keir Nellyer
3dc9038bae
Fix incorrect column name in statement
2016-10-11 01:22:43 +01:00
Keir Nellyer
1f47d51935
Merge branches 'develop' and 'update/report-non-sequential' of github.com:Mineplex-LLC/Minecraft-PC into update/report-non-sequential
...
# Conflicts:
# Plugins/Mineplex.ReportSite/view.php
2016-10-11 00:55:26 +01:00
Keir Nellyer
f39ee7c247
Update chatsnap site to handle new token system
2016-10-11 00:45:33 +01:00
Keir Nellyer
5c5c159ee3
Add support for assigning tokens to snapshots (excluding actual
...
generation part)
2016-10-11 00:22:29 +01:00
Sam
2b2bb817be
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm
2016-10-09 12:24:51 +01:00
Sam
2b124cb16c
I have really lost track on what I'm doing...
2016-10-09 12:24:49 +01:00
Shaun Bennett
0dca2e9d46
Fix BabyFirework NPE, TreasureLocation argument exception, Add TimingsFix to Hub
2016-10-08 19:42:29 -04:00
Sam
28a2a8c098
More from GI testing
2016-10-08 11:14:55 +01:00
Keir Nellyer
e4d3621512
Create SnapshotMetadata class in prepartion of snapshot tokens
2016-10-07 18:25:20 +01:00
LCastr0
8ab61b2b06
Public:
...
- Added Chicken Mount
- Added Turkey Morph
Internal:
- Changed the Morph system (Using UtilMorph)
2016-10-06 14:19:44 -03:00
LCastr0
3707de6742
Made Haunted Chests buyable
2016-10-06 12:43:19 -04:00
LCastr0
9f66bf438c
Fixes for the CustomerSupport server
2016-10-06 12:43:19 -04:00
Sam
e5e953a8ab
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm
2016-10-06 15:03:53 +01:00
Sam
bb9ca490b1
GI changes
2016-10-06 15:03:51 +01:00
Kenny
0f44483f07
Merge pull request #233 from Mineplex-LLC/project-cosmetics
...
Project cosmetics
2016-10-06 04:31:56 -04:00
LCastr0
d6e9283cce
Changed world time so its not too dark
2016-10-06 05:26:58 -03:00
Shaun Bennett
a6727bf104
Halloween Fixes/Prep
2016-10-05 22:57:44 -04:00
LCastr0
c0754a23c8
Fix Slime Soccer, Add /unlockcosmetics and /lockcosmetics for other players ( #232 )
...
* Added option to run /unlockcosmetics and /lockcosmetics for other players
* Fixed Slimeball Soccer field location
2016-10-05 22:08:27 -04:00
cnr
bd90c465dd
Update PPC button to reflect new claiming style
2016-10-05 22:03:04 -04:00
cnr
20c37bf3d6
Unlock PPC cosmetics on the first of the month
...
The relevant cosmetic will be revoked if the player's subscription
lapses during that month
2016-10-05 22:03:04 -04:00
cnr
8793be56ed
Add 'come back on $DATE' message to carl for Power Play
2016-10-05 22:03:04 -04:00
LCastr0
a1ec102419
Fixed Slimeball Soccer field location
2016-10-05 21:54:17 -03:00
LCastr0
5939c304a5
Added option to run /unlockcosmetics and /lockcosmetics for other players
2016-10-05 20:13:30 -03:00
LCastr0
876d35b482
Cosmetics Bug Fixes ( #229 )
...
* Fixes for the Block Morph
* Fixes for the Witch Morph
* Fixed memory leak on ArrowTrailHalloween, thanks to Sam, again
2016-10-05 17:16:25 -04:00
Alexander Meech
dae3c60247
Make support text for power play claims more accurate ( #228 )
...
* Make support text for power play claims more...
...accurate
* Reverse text
2016-10-05 17:13:32 -04:00
Shaun Bennett
25000f7367
Merge pull request #226 from Mineplex-LLC/bugfix/report-hotfix
...
Report feature hotfixes
2016-10-05 17:13:08 -04:00
Lucas de Castro Queiroz
49510e6f9f
Fixed memory leak on ArrowTrailHalloween, thanks to Sam, again
2016-10-05 16:21:40 -03:00
LCastr0
314c88333a
Merge pull request #230 from Mineplex-LLC/develop
...
Merges develop into project-cosmetics
2016-10-05 16:14:51 -03:00
Keir Nellyer
643656de0d
Merge remote-tracking branch 'origin/bugfix/report-hotfix' into bugfix/report-hotfix
2016-10-05 15:32:05 +01:00
Keir Nellyer
e6bb0c2d78
Improve handling of circumstances whereby a report exists but no
...
corresponding chatsnap log on chatsnap site
2016-10-05 15:31:46 +01:00
LCastr0
8da5813f29
Add Halloween Cosmetics ( #227 )
...
* Internal:
Changed imports from java.awt.Color to org.bukkit.Color
External:
Added Double Jump Halloween
Added Arrow Trail Halloween
Added Pumpkin Hat
* Internal:
Fixed Arrow Trail Halloween
Added new methods to ParticleData
Renamed playerNPC to _playerNPC (WinEffectLavaTrap)
Removed unecessary method (WinEffectManager)
Added a command to test win rooms properly
Fixed Squid Morph not showing name unless players hovered over it
Created a Manager for the Morphs so we avoid using deprecated methods
External:
Added Halloween Win Room
Added Grim Reaper Morph
Added Headless Horseman Morph
Added Nightmare Steed
* Internal:
Renamed RewardType enums to have upper case
External:
Added Halloween Death Effect
Added Haunted Chest
Added Baby Zombie Jockey Pet
Changed the names of the items
Added Grim Reaper pet
* Slack integration to test stuff (Will not be in the code in the last commit)
* Fixed Grim Reaper Hoe not being removed after the morph is disabled
* Details for the Haunted Chest
* Details for all the items (lores, icons, texts, effects, etc)
Removed Headless Horseman Morph
* Fixes for lores and names
Support server stuff
* Fixes for the Lock and Unlock cosmetics commands
* Fixes for the Grim Reaper Morph
* Fixes for the Grim Reaper Morph
Removed debug messages
* Fixed a memory leak. Thanks to Sam
* Fix imports
* Removed unused code
Added javadocs to UtilTextBottom#displayProgress()
Added javadocs to UtilAlg#getRandomLocation()
* Removed Death Effect
Increased Arrow Trail particles
Increased Double Jump particles
2016-10-05 10:27:45 -04:00
Keir Nellyer
a4e1fb3c8d
Prepare database for snapshot tokens
2016-10-05 14:31:01 +01:00
Keir Nellyer
46db80a056
Always check game object is not null before attempting to access it ( #225 )
2016-10-04 15:32:04 -04:00
Sam Sun
5d8c079be6
Understand the squid disguise code ( #217 )
2016-10-04 15:28:12 -04:00
Keir Nellyer
22707d6d2e
Only execute if throwable is null
2016-10-04 16:34:19 +01:00
Keir Nellyer
6709001c89
Remove double handle check, pointless and can potentially cause issues
2016-10-04 16:25:51 +01:00
Keir Nellyer
afee339e16
Any report with a handler and no conclusion is an active report,
...
therefore we don't need to check if the report is active
2016-10-04 16:20:11 +01:00
Keir Nellyer
c462282632
Merge branches 'bugfix/report-hotfix' and 'develop' of github.com:Mineplex-LLC/Minecraft-PC into bugfix/report-hotfix
2016-10-04 10:40:43 +01:00
LCastr0
515fd9fb70
Merge branch 'project-cosmetics' of github.com:Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-10-03 22:44:24 -03:00
LCastr0
fb29947705
Fixes for the Witch Morph
2016-10-03 22:43:49 -03:00
Sam
53c6c07208
Lazer to Laser
2016-10-03 23:17:14 +01:00
Sam
e48dfbefe4
Even more fixes!
2016-10-03 21:20:15 +01:00
Sam
4e9cf4dbb4
More fixes
2016-10-03 19:45:15 +01:00
Keir Nellyer
a923f80438
Accidentally missed out inserting reportTeams' "enums"
2016-10-03 19:24:01 +01:00
Keir Nellyer
17b04a6a84
PC-1021 Prevent 'null' player being punished
2016-10-03 10:00:04 +01:00
LCastr0
0181e21853
Fixes for the Block Morph
2016-10-01 23:54:35 -03:00
Sam
668abad83a
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm
2016-10-01 15:49:10 +01:00
Sam
4bfc632fd5
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm
2016-10-01 15:45:05 +01:00
cnr
e867a09b5c
Update support server to accommodate power play changes
2016-09-30 21:52:07 -07:00
cnr
6e2512e0cf
Merge branch 'project-cosmetics' into develop
2016-09-30 21:47:08 -07:00
cnr
d00c887a84
Hide Power Play Metal Man reward for now
2016-09-30 21:00:02 -07:00
LCastr0
76fc4d6ac4
Merging
2016-10-01 00:46:36 -03:00
LCastr0
0797f90d3b
Fixes for the Witch Morph
2016-10-01 00:42:40 -03:00
cnr
25701dae7d
Enable Metal Man morph in the GUI
2016-09-30 20:25:57 -07:00
cnr
4b1b57d452
Add first-time signup Metal Man reward
2016-09-30 20:17:07 -07:00
cnr
64802769d6
Implement Power Play reward month calculations
2016-09-30 11:13:29 -07:00
Keir Nellyer
7926d88d5b
Update report result reason length as future version of Minecraft
...
will be increasing message lengths
2016-09-30 17:18:47 +01:00
cnr
4fe5eb8b45
Stub out new Power Play rewards calculations
2016-09-30 00:10:42 -07:00
TadahTech
2a81f2b317
Fix UI for PlayWire changes
...
Fix memory leak in Menu
(cherry picked from commit 770c899)
2016-09-30 00:56:40 -04:00
Sam
36c26c0b2c
Fix MineStrike Issues ( #222 )
...
* Check if the costume is null before doing anything.
* Disable entity specing
2016-09-29 23:37:41 -04:00
Sam Sun
81070eac62
Plug up memory leaks in IdleManager ( #224 )
...
Somehow, IdleManager was keeping Player references loaded
despite having removed them on PlayerQuitEvent.
This may be because of the runnable scheduled for 5 ticks after a teleport
which would insert players after they quit.
In any case, this was keeping entire worlds loaded in UHC. Pretty bad.
Moral of the story? Use UUIDs!
2016-09-29 23:29:53 -04:00
Alexander Meech
0caa84f703
Optimize Clan Banners ( #221 )
...
* Optimize BannerRepository.java
* Optimize banner loading in BannerManager.java
* Optimize banner loading in ClansManager.java
* Remove unnecessary runAsync
* Optimize Siege Weapon storage
* Forgot a ! in my while loop
2016-09-29 23:04:19 -04:00
Timothy Andis
7d4c817856
Game Lobby/Playwire/Command Fixes ( #223 )
...
* Tweak team locations to accommodate MPS'
Disable certain commands from being used.
* Change PlayWire things.
* Update MPS locations.
* Update.
* Remove debug
* Remove debug. Ty Sam
2016-09-29 23:00:26 -04:00
Keir Nellyer
2a2cd5024a
Change message displayed when an error occurs
2016-09-30 01:56:49 +01:00
Keir Nellyer
ee532c1b8e
Improve exception handling
2016-09-30 01:44:49 +01:00
Keir Nellyer
de72f119fe
Don't allow players to handle new accounts in exceptional cases
2016-09-30 01:28:07 +01:00
Keir Nellyer
4818936943
Prevent double exception logging
2016-09-30 01:16:30 +01:00
Keir Nellyer
45eeac8cee
Prevent double exception printing when an error occurs whilst saving
...
a report
2016-09-30 01:05:50 +01:00
Keir Nellyer
26d6540b2f
Fix closing reason being truncated with long closing messages
2016-09-30 00:36:52 +01:00
Keir Nellyer
dd5a284d55
Print stacktrace when unable to fetch report player is handling
2016-09-30 00:29:57 +01:00
Sam
22f8a1496a
Guardian fixes
2016-09-29 22:44:03 +01:00
Shaun Bennett
9d6985ddcd
Fix MPS zip file name, null amp stand
2016-09-29 09:10:25 -04:00
Shaun Bennett
b3d8c72953
Add Game Lobby world settings ( #220 )
2016-09-29 00:22:42 -04:00
Shaun Bennett
7ff6e33941
LegacyGameLobbyManager bug fixes
2016-09-28 23:05:02 -04:00
Timothy Andis
620e219b14
Change MPS world zip ( #219 )
...
* Change MPS map name
2016-09-28 21:32:51 -04:00
Shaun Bennett
b27e1ffbd1
Reward shards on thank claim instead of when being thanked
2016-09-28 21:28:07 -04:00
Shaun Bennett
3ede0e5644
Merge Report System v2 ( #216 )
...
Report system (v2)
2016-09-28 17:39:26 -04:00
Timothy Andis
3d7647b26b
Game Lobby Update ( #215 )
...
* Game Lobby update. Phase 1.
* Correctly apply kit data to players who use the next best game feature.
* I can do integer comparisons, I promise.
* So much stuff, all minor.
* Suck it Carl.
* Fix Party bug.
Update LobbyManager
* Allow QA to test KitProgression @shaun cherry pick this plz.
* Proper generation check (testing)
Remove debugging from NextBestGame
* Correct Amplifier looking direction.
Fix Death tag hard coded kits
Misc podium work.
* ClansHub and Tweaks to the lobby manager
* WA Tweak.
2016-09-28 10:17:05 -04:00
Keir Nellyer
31dcc87385
Slight code cleanup
2016-09-28 10:51:55 +01:00
Keir Nellyer
f8ad302d80
Simplify handling of optional reason
2016-09-28 10:41:56 +01:00
Keir Nellyer
6f77c05f1e
Players should still be report banned if they reach abuse threshold
...
even if reportCloser is not present
Also alert players of report closing regardless of whether
reportCloser is present
2016-09-28 10:40:39 +01:00
Keir Nellyer
84e1a7291b
Report result gui should handle messaging of player invoking team
...
assignment
2016-09-28 10:35:49 +01:00
Keir Nellyer
e54f70d194
JavaDocs for abortReport and assignTeam methods
2016-09-28 10:31:54 +01:00
Sam
c4e36b2269
Moppletop's September Bug Sprint ( #214 )
...
* Earth Cost issue
* Instances of "Tip" to "Thank"
* PC-930
Fix an infinite loop when the game ends.
* PC-959
Fixes an issue where people could spam drop grenades.
* PC-668
Cosmetic Set bonuses no longer carry into MS games
* Changes metal's passive
Metal's passive is now that it gains 0.5 hearts per armor piece. This
avoids the problem of being unkillable
2016-09-27 21:11:49 -04:00
Sam
78e6f3bf71
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm
2016-09-27 19:02:56 +01:00
Sam
68c62acb00
Guardian changes
2016-09-27 19:02:54 +01:00
Keir Nellyer
1543b539ba
Refactor unbox optional collection to utility class
2016-09-26 11:01:27 +01:00
Keir Nellyer
f42681c390
Remove old todo
2016-09-26 10:33:46 +01:00
Keir Nellyer
f63561b05e
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-09-26 10:19:13 +01:00
Keir Nellyer
125428d09e
Make getReport return Optional as it is quite likely that this will
...
return null
2016-09-26 10:02:30 +01:00
Sam
96e1e944e1
Addition of the GWEN kit and a billion other things
2016-09-25 22:32:23 +01:00
samczsun
b35d933e56
Fix PlayWire error, handle future errors properly
2016-09-25 16:28:02 -04:00
samczsun
3f3241bec9
Reformat developer servers
2016-09-25 16:28:01 -04:00
Keir Nellyer
32385d4064
Update error message for non-titans, due to change made in previous commit
2016-09-25 02:28:42 +01:00
Keir Nellyer
a413df9f52
Limit feature to titans for damage limitation
2016-09-25 02:01:10 +01:00
Keir Nellyer
42ea7f85af
Remove un-required tab changes
2016-09-25 01:36:23 +01:00
Keir Nellyer
17b98888fc
Update database upgrade script for latest changes
2016-09-25 01:29:18 +01:00
Sam
f8a135cf50
Full system conversion
2016-09-25 00:56:06 +01:00
Sam
315a50aa16
Whoops
2016-09-24 21:34:45 +01:00
Sam
baafa62713
Just more converting
2016-09-24 21:09:25 +01:00
LCastr0
1475243d8a
Added MetalMan to the GUI for testings
2016-09-23 23:14:10 -03:00
Sam
f5a7f35d94
More kits
2016-09-23 18:58:14 +01:00
samczsun
187c6ec67c
Remove debug messages
2016-09-22 21:25:40 -04:00
samczsun
548e23a212
Fix fetching timestamp from wrong column
2016-09-22 21:21:16 -04:00
Sam
f6acedba5f
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm
2016-09-22 17:11:25 +01:00
Sam
2ba2b21577
Progress on converting SSM to a new cleaner system
2016-09-22 17:11:21 +01:00
Keir Nellyer
b24429783b
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-09-22 16:28:16 +01:00
Keir Nellyer
df17177892
PC-1003 Forgot to commit some changes from last commit
2016-09-22 16:10:31 +01:00
Keir Nellyer
ea74826d0c
PC-1003 Prevent rogue Report objects being cached and cause handler message spam
2016-09-22 16:01:11 +01:00
Keir Nellyer
6494720d2e
PC-998 Limit chat messages to 3 minutes
2016-09-22 15:48:01 +01:00
Shaun Bennett
79e6903c8b
Enable Speed and Glide punishments, remove hack from ban reason
2016-09-22 08:44:58 -04:00
Shaun Bennett
7f447f8084
Setup compass for game changes
2016-09-22 00:33:48 -04:00
Shaun Bennett
a3d210871d
Add ignored checks to GWEN ( #211 )
2016-09-21 23:21:02 -04:00
Shaun Bennett
e15804fc15
Prevent players from joining 1.9+ games with 1.8 clients ( #212 )
2016-09-21 23:19:55 -04:00
Shaun Bennett
9be26a92d1
Remove NCP
2016-09-21 22:21:49 -04:00
Sam
ac967f6b18
OITQP no longer in Beta ( #210 )
...
* Convert OITQP into a module based system.
* More magic modules
* Achievements and Stats
* Achievement menu update
* Removed some Util methods I added that were never used.
* Missed a few things
* To Alex, Love Sam
* Gem and achievement kits
2016-09-21 22:05:21 -04:00
Sarah
c1c46aceb8
Skyfall Game( #208 )
...
* basic prototype of the game Skyfall
* new crumble mechanic
* Developing basic game with basic mechanics and basic kits.
* Fix merge issues
* Add Supply Grop and Deathmatch and change map crumbling
* Make cosmetical changes for QA and add Stat Trackers and Achievements
* Add version requirement
* Change scoreboard layout
* Dont crumble the first island, but the islands over the spawn points
* Remove Surefoot, fix TNT, remove boats and remove elytra on contact with water/lava
* Unused imports
* Fix kit description, modify island crumbling and add ring damage
* Revert to normal crumble values
* Add Javadoc
* Remove more unused imports
* Check for material data on ring generation
* Add Block effect for Booster Ring recharge
* Unused imports...
* Add Elytra removal message and countdown
* "Fix" food issues and some other minor things
* Add chest refill to scoreboard from beginning
* Fix supply drop
* Unused imports.....
* Re-enable Anti Cheat
* Add java doc, remove system messages and add exeptions
* The end of the great label debate
* Fix method naming conventions
* Remove more labels
* Disable Booster kit
2016-09-21 21:57:38 -04:00
samczsun
7252906d30
Better synchronization of Managers
2016-09-21 21:37:57 -04:00
samczsun
92a0d606d4
Fix timings
2016-09-21 21:37:57 -04:00
samczsun
ec4add259d
Teleport players back to center of arcade lobby
2016-09-21 21:37:57 -04:00
Timothy Andis
bf61296948
PlayWire Ad integration ( #207 )
...
* PlayWire integration.
* Tweak PlayWire display.
Update the GUI command.
Temp set cooldown to 10 seconds for testing *WILL BE REMOVED*
* PlayWire stuff.
* PlayWire streaks and tweaks.
2016-09-21 21:24:58 -04:00
Keir Nellyer
1eecfbafee
Small code improvement
2016-09-21 16:33:05 +01:00
Keir Nellyer
c6eb23812f
PC-1001 Do not show private messages between users unless reporter is
...
involved
2016-09-21 13:21:23 +01:00
Keir Nellyer
09287ddefc
PC-1002 Automatic reports bans show the id of the report which caused
...
the ban
2016-09-21 12:22:55 +01:00
Keir Nellyer
e73b06b5ab
PC-998 Change cache time for chat messages to 5 minutes
2016-09-21 11:46:03 +01:00
Sam
209ea32ef9
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm
2016-09-20 09:18:20 +01:00
Keir Nellyer
32563904fa
PC-997 Show total counts when showing report statistics
2016-09-19 10:38:03 +01:00
LCastr0
f0c7b1d6aa
Whoops, forgot this
2016-09-18 16:18:33 -03:00
LCastr0
537dc28daa
Used proper method to add specific prizes
2016-09-18 16:16:57 -03:00
LCastr0
ae6868b76a
Added Witch Morph
...
Added Metal Man morph
2016-09-16 20:46:52 -03:00
Keir Nellyer
2cdab061b6
PC-886 Move report bans over to punishment gui
2016-09-16 17:40:14 +01:00
Keir Nellyer
ebe212c8ff
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-09-15 17:30:27 +01:00
William Burns
199d6cba3e
Add a period to the anticheat ban message. ( #206 )
2016-09-14 20:50:08 -04:00
Alexander Meech
93c227a22d
Change Mavs Basketball to 5 Minutes ( #201 )
...
* Update ScoringManager.java
* Update Basketball.java
2016-09-14 20:49:24 -04:00
Keir Nellyer
da5a8d5b46
PC-966 Reports assigned to RC now have a higher priority instead of no decay effect
2016-09-14 21:51:06 +01:00
Keir Nellyer
a64ba4db2a
Include sender as being a recipient for testing reasons when checking if player can create a chat abuse report
2016-09-14 21:44:57 +01:00
Sam
1458cb84b9
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm
2016-09-14 20:14:05 +01:00
Keir Nellyer
9af606ae20
Ensure suspect messages actually involved the reporter
2016-09-14 14:53:39 +01:00
Keir Nellyer
efe532e8a6
Clean-up createReport method
2016-09-14 14:37:44 +01:00
Keir Nellyer
464099dc87
Correctly handle weird cases whereby an account may be involved in
...
multiple open reports of the same category
2016-09-14 14:26:12 +01:00
Keir Nellyer
2be0522599
Attach JavaDocs and small method renames
2016-09-14 14:14:11 +01:00
Keir Nellyer
425d814ac4
PC-966 When selecting a new report for a user to handle, always
...
prioritise reports assigned to teams that the user is a member of
2016-09-14 12:14:14 +01:00
Keir Nellyer
5ad4f2831d
PC-966 Only allow members of team to handle report if team assigned
...
to report
2016-09-14 12:13:41 +01:00
Keir Nellyer
20c4488c5f
PC-966 Add gui button for passing report to RC team
...
Misc. other changes
2016-09-13 18:28:09 +01:00
Keir Nellyer
d115097eb9
PC-966 Implement support for teams to be assigned to a report
2016-09-13 17:01:47 +01:00
Keir Nellyer
f1d1585585
PC-966 Implement method to get members of a team
2016-09-12 18:13:10 +01:00
Keir Nellyer
ee6e8a9656
PC-966 Implement report user cache
2016-09-12 18:07:01 +01:00
Keir Nellyer
a39d894d85
PC-966 Add support for saving report teams to database
2016-09-12 17:54:00 +01:00
Keir Nellyer
fae7e93f1a
PC-966 Add support for loading report teams from database
2016-09-12 17:08:11 +01:00
Keir Nellyer
a5e5be4329
PC-951 Fix handler message task not being cancelled when closing report
2016-09-12 11:56:21 +01:00
Keir Nellyer
5e5cb3284a
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-09-12 10:11:31 +01:00
cnr
6de3640243
Disable immediate ban actions for Glide and Speed
2016-09-11 17:54:50 -05:00
LCastr0
36ce7ef222
Fixes for the Omega chest giving duplicated items ( #202 )
2016-09-10 23:05:29 -04:00
Connor James
454e1c8c11
AntiCheat 1.2 ( #200 )
...
* Implement Anticheat 1.2 hooks
* Add default check thresholds for unknown check types
* Add violation level support for new checks
* Add ban waves for KillAura type D
* Amend DELETE_PENDING now that it's not hardcoded
* Add instant bans for high VL Glide/Speed
* Don't specify hack type in banwave ban message
2016-09-10 23:01:13 -04:00
Sam
38473dcffd
Fix metal taking too little damage with full iron ( #203 )
2016-09-10 22:47:52 -04:00
LCastr0
f6b06c63ac
Fixes for the Omega chest giving duplicated items
2016-09-10 00:43:08 -03:00
AlexTheCoder
23a330d449
Add monster maze and bawk bawk battles to mixed arcade display in compass and set beta button to new oitq payload gamemode
2016-09-08 03:50:45 -04:00
Shaun Bennett
e12ed35da1
Fix NPE and kit upgrades issue
2016-09-07 23:13:28 -04:00
Shaun Bennett
493086fcf3
Merge pull request #198 from Mineplex-LLC/update/developer-servers
...
Update/developer servers
2016-09-07 21:21:35 -04:00
Shaun Bennett
9318ba4de2
Merge branch 'develop' into bugfix/samczsun
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java
2016-09-07 20:12:57 -04:00
Shaun Bennett
7fbd6087eb
Merge pull request #187 from Mineplex-LLC/update/oitq
...
Skywars Update Patch
2016-09-07 20:08:08 -04:00
samczsun
fba449ca03
Don't rearrange GUI if all dev servers are ingame
2016-09-07 19:17:47 -04:00
samczsun
a8adf23c15
Allow dev servers
2016-09-07 11:45:42 -04:00
Keir Nellyer
7b6f0ae221
PC-953 Make report ids in /reportstats command clickable
2016-09-07 16:40:05 +01:00
Sam
bed563876a
Add a comment to explain usage of KitUpgradeShop
2016-09-07 14:18:07 +01:00
Shaun Bennett
ba322f0df1
Merge pull request #195 from Mineplex-LLC/update/emergency-support-fixes
...
Update/emergency support fixes
2016-09-07 07:57:53 -04:00
Shaun Bennett
b1b9900c9e
Add offline stat checking
2016-09-07 07:47:19 -04:00
Keir Nellyer
e2840f36b5
PC-958 Don't allow chat abuse reports of players who haven't spoken
...
in chat
2016-09-07 11:28:20 +01:00
Keir Nellyer
640a8d3516
PC-958 Allow reporting of offline players
2016-09-07 09:50:10 +01:00
AlexTheCoder
225583a13d
Remove join restrictions on beta servers from unranked players
2016-09-06 21:36:30 -04:00
Sam
5bf35d49db
Message inconsistancy
2016-09-06 21:38:43 +01:00
Sam
be268991b0
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
2016-09-06 21:37:33 +01:00
Sam
7a5a6c3d00
Fix duplicate message
2016-09-06 19:55:31 +01:00
Keir Nellyer
353cdb2413
Merge remote-tracking branch 'origin/feature/report-v2' into feature/report-v2
2016-09-06 17:28:03 +01:00
Keir Nellyer
b1b275fc67
PC-958 Prepare codebase for reporting of offline players
2016-09-06 17:27:48 +01:00
Keir Nellyer
94b5a6e760
PC-952 Add /reportinfo
2016-09-06 16:43:51 +01:00
AlexTheCoder
64db10c91a
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/emergency-support-fixes
2016-09-05 20:27:09 -04:00
AlexTheCoder
a124aa3d85
Fix items added via support server not showing up in customer service logs
2016-09-05 20:25:02 -04:00
samczsun
444fe5d151
Remove hacky reflection method to get server name
2016-09-05 18:37:17 -04:00
samczsun
08090f5e06
PC-818
...
Seismic Charges can no longer remove barrier blocks
2016-09-05 18:25:16 -04:00
samczsun
11c97691a9
PC-937
...
This commit allows Arcade to consider spectating and vanished players when
deciding to autostart a game
2016-09-05 18:25:16 -04:00