8a75a5098c
Remove hub invisibility preference for all but Admins and higher.
2016-05-17 18:08:01 -05:00
014ce137fc
If a player uses /a regardless of if staff are online, offline, or vanished, making it always yield a response telling the player that if there are staff currently online, they will receive a reply soon - removing the "there are no staff online" message. Also a 60s Recharge for this.
2016-05-17 18:03:18 -05:00
6760c07e6c
Fix staff members getting stuck in both Incognito mode and the Hub Invisibility preference, and not being able to toggle either off them off because Incognito would stop Hub Invisibility from getting toggled (on OR off), and vice versa.
2016-05-17 18:00:20 -05:00
6e9b0e4fa5
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java
2016-05-17 14:41:17 +02:00
6042be2d2f
Refactor clans ban functionality and remove UtilStreams
2016-05-17 05:57:27 -05:00
f5cf751622
Revert "Temporarily disable clans ban functionality"
...
This reverts commit b47c49d93b
2016-05-17 05:51:18 -05:00
43cadf564e
Fix Carl the Creeper. Fix Bridges TNT exploit.
2016-05-16 22:03:27 -05:00
1fc4239b89
Determine whether Ice Prison target is valid. Fixes PC-281
2016-05-16 15:44:22 -05:00
1497662b2e
Restrict help display for main Game Command
2016-05-16 03:16:26 -04:00
4633b99ad4
Don't block QA from testing, whoops.
2016-05-16 08:07:42 +01:00
fb63b3a1a4
Fixes for winroom command, and illuminated chest
2016-05-15 22:49:10 -03:00
42eef838b3
Fixes podium not being enabled by default
2016-05-15 21:33:36 -03:00
a27a618b2f
Made debugging tools only available on test servers
2016-05-16 02:04:15 +02:00
816a7ca232
Re-Activated chest buttons
2016-05-16 01:57:58 +02:00
d92ad9c53f
Made illuminated chest purchasable and added appropriate lore
2016-05-16 01:51:40 +02:00
511726f72a
Treasure chest coin checker for test servers
2016-05-15 20:43:46 -03:00
4ebf48bd45
Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics
2016-05-16 01:34:08 +02:00
8ad7646128
Edits to treasure chests
2016-05-16 01:33:54 +02:00
f8d5bd3c11
Fixed treasure chests
...
Items would sometimes pop out of chest blocks
You could open illuminated chests before they were converted to real
chests
2016-05-16 00:51:33 +02:00
09b7fbdbbe
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-05-15 18:48:00 -03:00
4f79ec6551
Pinata fixes
2016-05-15 18:47:09 -03:00
b4aad690e5
Fixed some rewards and added party trail to chests
2016-05-15 23:31:10 +02:00
fdf167953f
Fixed emerald set order
2016-05-15 23:30:17 +02:00
ca556f7846
Fixed win room would not sort player properly for solo games
2016-05-15 23:29:58 +02:00
7073ba4e6a
Fixed gadgets in the win room
2016-05-15 23:29:24 +02:00
1e6dda2d7d
Cleaned up some win effect backend code & fixed kits working in winroom
2016-05-15 23:28:12 +02:00
14f7e64a77
Fixed Animator and removed duplicate test call in Game.java
2016-05-15 21:05:37 +02:00
d850bed725
Minor code tweaking
...
* Made reward manager ammo multiplier private final field
* Removed old commented code from WinEffectPodium, WinEffectLavaTrap,
ParticleMusic, ParticleEmerald, ParticleBlood
* Cleaned up the GameModifierMineStrikeSkin filter
* Removed unused Math#isBetween(double, double, double) method
* Changed Animator to use PriorityQueue
2016-05-15 19:43:07 +02:00
29a0ba565b
Added better hollow calculations to ShapeBox and UtilBlock
2016-05-15 17:05:11 +02:00
296f304d29
Changed the way UtilItem.dropItem handles despawning
2016-05-15 17:04:50 +02:00
a8db293bcf
Moved JavaDocs from ICosmeticShape (now removed) to CosmeticShape
2016-05-15 17:04:25 +02:00
97f82e422d
Merge branch 'project-cosmetics' of
...
ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into
project-cosmetics
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/animation/Animator.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/animation/AnimatorEntity.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ICosmeticShape.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ShapeWings.java
2016-05-15 16:03:36 +02:00
aa36097729
Made Animator abstract and added final modifiers
2016-05-15 15:58:05 +02:00
22e54557d8
Fixed cleaning method for WineffectRiseOfTheElderGuardian
...
The class contained commented code, removed when debugging
2016-05-15 15:33:42 +02:00
abddc446fd
Added java docs and tweaked code
...
* Fixed possible duplication bug in MulitBlockUpdaterAgent
* Tweaked some of the factor methods for Shape.java
* Cleaned some code in ShapeWings.java
2016-05-15 15:32:44 +02:00
44e52f4b5b
Add javadoc to added files
2016-05-15 10:24:29 +02:00
a67fec95fc
Remove ultra tag
2016-05-15 03:21:58 -05:00
a1a6abc1ca
Add champions gladiators and fix tiny winners typo
2016-05-15 10:13:06 +02:00
1cc44d1b3e
Fixes for the following classes:
...
KitGameModifier
KitModifierType
MultiBlockUpdaterAgent
Shape
GadgetManager
KitModifierType
HatLovestruck
HatSecretPackage
SetLove
Animator
AnimatorEntity
AnimationPoint
ICosmeticShape
UtilText
KitGameModifier
KitModifierType
Removed build.xml and org.eclipse.jdt.ui.prefs
2016-05-15 00:20:07 -03:00
24f7a4b409
Added "(Minestrike Weapon Skin)" suffix to MS skins in treasure rewards
2016-05-14 18:53:09 +02:00
b2e92fdf15
Don't pass on INTERACT_AT as INTERACT. Fixes PC-114
2016-05-14 09:42:28 -05:00
20b9f428b4
Fixes Illuminated Chest's Lore
...
Fixes Pinata Burst not being saved
Fixes AWP Asiimov and XM1014 Tranquility materials
Removes Fireworks WinRoom
Changes prices of things from 1 shard to Treasure Chest
More unused imports removed
Fixed ANGLE_WING_PATTERN -> ANGEL_WING_PATTERN
Adds javadoc to UtilColor.applyColor()
Adds javadoc to UtilColor.getNextColor()
defaultLeatherColor -> DEFAULT_LEATHER_COLOR
Adds suggestions for UtilColor
Adds final modifier to _worldBorders (UtilPlayer)
Changed _worldBorders key from String to UUID
Adds suggestion for UtilPlayer
Adds final modifier to _type (GameModifierSubPage)
Adds final modifier to _type and _kitType (KitGameModifierPage)
DefaultDencity -> DefaultDensity (Shape)
Changed <Vector> to <> (Shape)
dencity -> density (ShapeBox, ShapeGrid, ShapeSphere)
Using speed and count in constructor (ShapeWings)
Removed empty constructor (WorldGenCleanRoom, MultiBlockUpdaterAgent)
Adds final modifier to all fields (AnimationPoint)
2016-05-14 01:18:37 -03:00
b802cdec6d
Rename shop to "Fountain Keeper"
2016-05-14 14:01:28 +10:00
63c44afa10
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants
2016-05-13 22:05:27 +02:00
df5c628c35
add new gamemodes Tiny Winners, Random Kit SSM, UHC SW, UHC SG and improve OP SG, OP SW, OP Bridges, Dukes of decoration, OP Gladiators, Faster than Light, Bunny Hopper and Countdown
2016-05-13 20:23:04 +02:00
0544e86cb1
Started fixing the stat tracking for MS knife
2016-05-13 02:39:43 +02:00
2cc609b67e
Moved some rewards from normal to valentines
2016-05-13 01:28:26 +02:00
35ab155756
Removed unnecessary lore from minestrike game modifiers
2016-05-13 01:20:06 +02:00
d34f77a381
Moved some rewards from normal to winter chest
2016-05-13 01:19:06 +02:00
9c2c415eb2
Fixed the emerald trail leaving from idle to moving
2016-05-13 01:14:00 +02:00
3bb3821fa9
WinEffect gadget disable and MineStrike name and data update
2016-05-13 01:04:35 +02:00
4958ab8149
Bug Fixes
...
* Fixed Menu page adding glow to win effects if game modifiers were
active
* MineStrike skins were not properly applying material and data
* Skinned knife was not dealing damage
2016-05-13 00:38:56 +02:00
06e583c05e
Added flat podium to Firework and Punchman
2016-05-12 23:50:41 +02:00
956d64d750
Git Merge Import Fix
2016-05-12 23:46:39 +02:00
29d4db0bfd
Merge branch 'project-cosmetics' of
...
ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into
project-cosmetics
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java
2016-05-12 23:46:17 +02:00
2db98613ab
Cosmetic Update
...
* Redid the Reward manager
Added new rewards to the chest and changed some values
* Fixed some MineStrike skin bugs
* Removed particles/death effects from Minestrike
* Removed old test minestrike skins
* Moved minestrike skins to correct package
* Changed the illuminated chest animation a bit
* Fixed other minor bugs
2016-05-12 23:42:37 +02:00
fab24e2139
Allow admins to be opped on testing servers
2016-05-12 17:24:37 -04:00
6f4c6bc545
Fixes counter on WindUp suit
...
Removes kit modifier categories
2016-05-12 15:00:43 -03:00
2ae072f5b7
Rename modules to correct name
2016-05-12 11:44:35 -04:00
05312a9bef
Update where players spawn upon first join...
...
...to avoid flight kick upon login
2016-05-11 21:57:42 -04:00
276f572009
Merge branch 'project-cosmetics' of
...
ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into
project-cosmetics
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathPinataBurst.java
2016-05-10 20:21:37 +02:00
1b0b9a894b
Tweaked some cosmetics
...
* Changed Party Death to firework icon
* Removed idle spark from Emerald Trail
* Changed wing style to pixie from angle on infernal wings
* Added black dots to YinYang
Started some work on the RewardManager
2016-05-10 20:20:44 +02:00
4fada6de49
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-05-10 12:45:22 -03:00
5b8ff933b1
Removed more unused imports
...
Fixed some lores and names for cosmetics
Renamed some classes to match Set name
Commented out the Lovely set (Duplicate of Cupid's Love)
Fixed set descriptions
Added 'Comming soon...' to set bonuses
2016-05-10 12:44:45 -03:00
8eba2c9ccb
Merge pull request #59 from Mineplex-LLC/feature/logitech-brand
...
Move billboard up 1
2016-05-09 11:55:22 -04:00
7932258579
Move billboard up 1
2016-05-09 03:44:16 -04:00
de1fabf53d
Disable report system as it is not ready to go live
2016-05-09 02:10:51 -04:00
4aa44cd796
Merge branch 'develop' into clans/beta
2016-05-08 16:53:48 -05:00
7c80c3826b
Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
2016-05-08 21:49:16 +01:00
ac86f3ac8c
Merge pull request #55 from Mineplex-LLC/alex-mcl
...
Change the visuals of the Billboards and of ELO's display in the stat…
2016-05-08 13:29:23 -04:00
34e8d65f4d
Change the visuals of the Billboards and of ELO's display in the stats menu to be more user friendly
2016-05-07 21:16:12 -04:00
b47c49d93b
Temporarily disable clans ban functionality
...
This can be reverted when clans bans are properly audited/fixed/tested.
2016-05-07 19:02:19 -05:00
b68127b111
Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
2016-05-08 00:37:59 +01:00
b1a41c3cb3
Make chat abuse colour easier on the eyes
...
Dark blue [bold] is hard to read, dark aqua [bold] should be easier
to read.
2016-05-07 22:48:49 +01:00
d75ba9d4c0
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants
2016-05-07 22:26:15 +02:00
38f22b1577
Disable obsidian dropping after breaking THE BLOCK
2016-05-07 19:51:19 +10:00
5649939f8c
Removed some old disabled code.
2016-05-06 21:59:18 +02:00
e04a897488
Added some pre-animation to chicken win effect. Removed some comments.
2016-05-06 21:58:31 +02:00
0fea90516b
Alternative emerald trail for full set
2016-05-06 13:24:06 +02:00
f58db6ee3b
Removed firework from party death
...
Replaced the death effect with item drops instead
2016-05-06 13:12:28 +02:00
d60fea4f76
Added chicken and guardian win room schematic handlers
2016-05-06 13:00:45 +02:00
60dce9ef1b
Change LT, Owner, Developer, Admin to DARK_RED
2016-05-06 13:43:30 +10:00
97ef801e3d
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-05-06 00:40:55 -03:00
49c45628a2
Removed more unused imports
...
Fixed some lores and names for cosmetics
Renamed some classes to match Set name
Commented out the Lovely set (Duplicate of Cupid's Love)
2016-05-06 00:40:22 -03:00
93c2886601
Add boosters to inventory menu
2016-05-06 13:31:59 +10:00
9f2189d173
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
2016-05-06 03:40:00 +02:00
55d40a1a6b
Merge pull request #53 from Mineplex-LLC/feature/logitech-brand
...
Changed design of billboard and fixed its centering in hubs
2016-05-05 18:33:15 -04:00
f329051399
Changed design of billboard and fixed its centering in hubs
2016-05-05 18:25:51 -04:00
17a4517e71
Merge remote-tracking branch 'origin/develop' into project-cosmetics
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
2016-05-05 21:03:15 +02:00
1a96ea3c18
Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics
2016-05-05 20:29:28 +02:00
db21c7dd22
EGit FTW!
...
Git, you are the greates, randomly deciding not to include everything
when I spesify you to do so....
This should have been part of prev commit.
2016-05-05 20:26:00 +02:00
875fb4eccd
The big bug fix batch
...
+ Added some text utils
+ Added angel wing shape
* Tweaked the wing particle effects.
* Fixed item tool not despawning items in arcade servers
* Removed strange gadget disable
* Updated some death/win effects and particles
* Added Illuminated chest
* Added MS skin name to death message
2016-05-05 20:07:29 +02:00
9fca9283e2
Fixed skin layers for Player/Human disguises
2016-05-05 10:39:00 +02:00
e1f2bb9740
Use all-man style braces here to be compliant with the coding standards
...
(cherry picked from commit e553ac5
2016-05-04 16:02:39 +01:00
a663cb3e01
Revert "Revert "Report system (version 1)""
...
This reverts commit d0d2de1e21
2016-05-04 15:24:29 +01:00
d7d00e1614
Merge pull request #52 from Mineplex-LLC/alex-mcl
...
Add a method for simply checking if a player has been participating i…
2016-05-04 09:30:00 -04:00
e7f97fa5b8
Move life related methods to challenge class
2016-05-04 16:21:14 +03:00
9d53eddabd
Fix lives amount display and remove disguises
2016-05-04 15:40:43 +03:00
703e957156
Fix volley pig health and knockback message
2016-05-04 15:38:18 +03:00
2b362ee4f1
Fix egg smash eggs sometimes stay on the map
2016-05-04 15:37:16 +03:00
0e509898ec
Add a method for simply checking if a player has been participating in the current game, and implement it in the ranked bans system
2016-05-03 21:07:50 -04:00
145ea9221a
Merge pull request #40 from Mineplex-LLC/clans/beta
...
Clans/beta
2016-05-03 16:57:07 -04:00
cfc6f3703d
Merge pull request #50 from Mineplex-LLC/develop
...
Merge from develop
2016-05-03 13:24:32 -03:00
57fca2a8d0
Temporarily(?) mitigate spigot CME
...
During a PlayerVelocityEvent in an unloaded chunk (usually as result of
a teleport), if one calls Location#getChunk() on the player's location,
and the chunk contains persistent entities, the server crashes with a
ConcurrentModificationException.
2016-05-03 04:56:31 -05:00
838cc2ce31
fix enchantments and increase arrow amount in gladiators
2016-05-02 23:01:59 +02:00
3c482e38cc
Merge pull request #47 from Mineplex-LLC/feature/logitech-brand
...
Convert over to System.out.println() for error messaging and add prot…
2016-05-02 16:34:58 -04:00
2cd76fbf72
Merge pull request #48 from Mineplex-LLC/alex-mcl
...
Add catch for rare occurrence where players have no stored data
2016-05-02 16:34:50 -04:00
3d98c08a67
Add in missing file
2016-05-02 16:33:11 -04:00
ccd5b47d75
Convert over to System.out.println() for error messaging and add protection for billboards in Hub via a new manager
2016-05-02 16:20:41 -04:00
8dd89d9dea
fix minor bugs and improve minor things in bridges, sg, uhc, quiver, runner and skywars
2016-05-02 20:27:43 +02:00
cd2bd8ac1d
Fix the TNT Cannon in the tutorial not exploding correctly when fired at the enemy base's doors, as that would cause the tnt entity to just slightly be out of the wall bound and that made the tutorial think that the player missed the wall, making that part of the tutorial near-impossible to pass unless known where to fire exactly. Along with this I also made the cannon rotation lock to a specific range so that people can't miss. Ever.
2016-05-02 11:49:56 +01:00
8a1b5572a8
Fix players in tutorial receiving messages from the real game whenever the message sender is not in a clan.
2016-05-02 10:31:45 +01:00
055b8684c2
- Added action bar message when booster is ready (Wind Up Suit)
...
- Moved each suit to an individual package, to make it easier to work with
- Removed some unused imports
- Added util to get entity egg data
- Added kit modifiers: Beastmaster, Horseman and Necromancer (SG), Apple (Bridges)
- Added specific kit pages to game modifier menu
2016-05-02 00:13:06 -03:00
71f8640189
implement Dukes of decoration, OP Gladiators, Countdown, Heroes of the ewe, OP Skywars, Ultra spleef, Assassins and Blood diamonds
2016-05-02 01:06:00 +02:00
026ab15099
Fix multiple leaving messages being broadcasted to the server when a player is kicked from the server after getting cbanned.
2016-05-01 23:20:55 +01:00
1e18707fd7
Include the missing PlayerMessageEvent, as I had also forgotten to add documentation about the class.
2016-05-01 23:06:30 +01:00
480cc0f9be
Fix NullPointerException when a player leaves the server without their Clans Ban client being loaded into memory beforehand.
2016-05-01 23:04:30 +01:00
e139bea465
Fix kill messages inserting a space below them in chat.
2016-05-01 23:03:18 +01:00
7e97bd346e
Change an internal method to private and add missing class JavaDoc
2016-05-01 15:16:42 -04:00
335c5a4510
Clean up billboard generation and clearing, rewrite MapRender for logos, and add JavaDocs to comply with code standard
2016-05-01 14:58:40 -04:00
6c2caac800
fix some format issues and implement God battles
2016-05-01 19:43:42 +02:00
7bd6cdb93c
Implement Lists and Maps into the variable system and finish more gamemodes
2016-05-01 18:48:07 +02:00
eae972a3e6
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-05-01 10:11:28 +01:00
9d97ea8d1e
Missing Clans ban cache class (to do with the commit previously by me)
2016-05-01 10:11:17 +01:00
4cffb39941
Delay dismount teleport by one tick
...
This mitigates a stack overflow caused by a teleport before a dismount
event processes fully.
2016-05-01 01:30:42 -05:00
48c8a5a630
Force structure to spawn correctly, complete with maps on item frames
2016-05-01 01:56:07 -04:00
189f9ad524
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-05-01 01:42:32 +01:00
2337e89a93
Improvements to the Clans ban system in general as it was performing more operations than required, and accessing the database more than was necessary. Polished up the Clans ban GUI as well.
2016-05-01 01:42:11 +01:00
8ca38b2598
Prepend http:// to resource pack locations
2016-04-30 18:54:17 -05:00
070326e72d
Create systems to automatically create and destroy branding boards, as well as implement the Logitech branding
2016-04-30 19:26:16 -04:00
10166f063b
Merge branch 'develop' into clans/beta
2016-04-30 16:16:57 -05:00
14204fba5c
Changed resource packs to home hosted ones
2016-04-30 16:02:26 -05:00
890ab9f67e
Uncommented ClansBanManager's instances
2016-04-30 16:02:26 -05:00
f1c2e71d56
Some changes to error handlng for clans regions
2016-04-30 16:02:26 -05:00
634a34dd52
Reintroduce non-Air constraint to cannon explosion
2016-04-30 16:02:26 -05:00
2eb7b892e0
Refactor cannon explosion effect for clarity
2016-04-30 16:02:26 -05:00
f2f627116a
Correctly count cannon explosion effect attempts
...
Previously, cannon explosions effects could lock up the main thread if:
- The effect location selection RNG was sufficiently unlucky
- The explosion occured sufficiently deep into a larger claimed
territory
2016-04-30 16:02:26 -05:00
39c105f0cf
Add catch for rare occurrence where players have no stored data
2016-04-30 15:34:04 -04:00
d0d2de1e21
Revert "Report system (version 1)"
2016-04-30 14:53:59 -04:00
e0e30a8b7f
Merge pull request #43 from Mineplex-LLC/alex-mcl
...
Fix Async Elo Ranked Bans
2016-04-30 14:46:49 -04:00
37a815d52a
Update JavaDocs to fit Mineplex standard
2016-04-30 14:41:28 -04:00
2e4bae6915
Merge branch 'feature/top-elo' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla
2016-04-30 14:14:14 -04:00
2dc5c46624
Fix naming convention on checkRankBannedAsync
2016-04-30 14:13:21 -04:00
41e26f283c
Fix all async elo ranked ban methods and switch to callback system for API hooks
2016-04-30 14:10:09 -04:00
6e35bc0989
Stop spamming the chat.
2016-04-30 00:55:59 -05:00
2490e3df82
Previous git merge cause this single line to be deleted
...
I literally have no idea why or how this happened.
2016-04-29 23:47:01 +01:00
6a00f26d5f
Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
# Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-04-29 23:42:27 +01:00
81cebc4ce7
Swap static helpers for a much better solution
...
This allows for easier refactoring in the future when we move away
from retrieving the CoreClientManager from a static instance.
Mineplex coding standards are also against the use of static helpers
in scenarios such as this, therefore this commit brings this branch
to be in-line with the coding standards.
2016-04-29 23:37:40 +01:00
89bd325c81
Fix continuous milking sound on milk a cow
2016-04-29 14:35:48 +03:00
aff5396384
Prevent death effect armor stand modification
2016-04-29 13:41:16 +03:00
184d247fc9
Start adding BoosterPage. Move Boosters to core to support UI's
2016-04-29 17:37:34 +10:00
f63a872bd4
Changed resource packs to home hosted ones
2016-04-29 14:46:14 +10:00
a8d9745320
- Fixed order of Top Elo
2016-04-29 00:12:25 -04:00
c814fc73f7
Uncommented ClansBanManager's instances
2016-04-29 12:53:20 +10:00
26f6a1189f
Prettyfy EloCommand
2016-04-28 21:34:43 -05:00
e83e4b270c
Prettyfy EloCommand
2016-04-28 21:34:07 -05:00
00efb7d72e
Fix ELO query
2016-04-28 21:20:48 -05:00
84ca13c0d3
Fix ELO query
2016-04-28 21:09:28 -05:00
80ea7b7a4c
Fix ELO query
2016-04-28 21:09:07 -05:00
5a4f89b484
Fix ELO query
2016-04-28 21:04:07 -05:00
7c279998ec
- Changed top elo queries
2016-04-28 21:55:51 -04:00
8e68d62356
- Added documentation for new EloManager methods
2016-04-28 21:16:18 -04:00
2887630cf8
- Added javadoc headers
2016-04-28 21:11:38 -04:00
4b7684da4c
Merge branch 'feature/top-elo' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla
2016-04-28 21:05:56 -04:00
e032b81842
- Made SQL calls async
2016-04-28 20:59:49 -04:00
562e950361
Remove File headers.
2016-04-28 19:46:13 -05:00
680e579223
Merge Alex's branch into mine.
...
Convert to Java 8
Remove unneeded comments.
2016-04-28 19:39:24 -05:00
168483a9fc
Communities work
2016-04-28 19:30:05 -05:00
725481f310
Top Elo data for Webpage
2016-04-28 19:23:57 -05:00
84c0b1b389
Top Elo data for Webpage
2016-04-28 19:22:45 -05:00
156982460f
- Fixed water permanently [MCL]
...
- Fixed team balancing [MCL]
- Fixed overjoining [MCL]
- Changed bans for quitting ranked matches [MCL]
2016-04-28 20:03:09 -04:00
b105ccb5f1
- Change event priority
2016-04-28 17:48:16 -04:00
b13528ed66
- Further blockage of creating source blocks [MCL]
2016-04-28 17:46:57 -04:00
3f9ef24235
- Removed debug message
2016-04-28 17:44:37 -04:00
5d1194192d
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/jobs-site
2016-04-28 18:19:45 +01:00
8874b52b39
Merge branch 'develop' into thanos-mineware
2016-04-28 19:27:56 +03:00
6084d04a0f
Commit before pulling from develop
2016-04-28 19:23:21 +03:00
992e150608
Refactor and comment classes
...
New javadoc comments have been added to describe class functionality
and variable usage on specific places.
2016-04-28 16:54:46 +03:00
bff5751691
Remove very last @author tag
2016-04-28 14:41:44 +01:00
3a5ec7dc5d
Continue refactoring and comment main class
2016-04-28 13:11:27 +03:00
6cc8f854c4
Refactor main game class
2016-04-28 13:02:44 +03:00
3161cd53e9
Apply new format on floating holograms
2016-04-28 12:31:09 +03:00
dcd376b837
- Improved graphics for Elo display in /stats
2016-04-28 01:01:14 -04:00
189296a586
- Fixed using water in restricted zones in MCL
...
- Implemented Elo in /stats menu
2016-04-28 00:53:04 -04:00
46f873634e
- Decrease time till Overtime in MCL
...
- Block ability to flood in MCL
2016-04-28 00:33:36 -04:00
b4c5be81f3
- Fixed random weather in MCL
...
- Added Elo Division display to /stats for applicable games
- Made fishing rods kept on death in MCL
2016-04-27 23:12:38 -04:00
d90e9e7dff
Add a system for allowing all players to use game commands when in the correct mode.
2016-04-27 20:54:52 +01:00
aff4b6b270
Fix minecart dance double life loss
2016-04-27 22:09:06 +03:00
b8d12c0c9d
Small wording changes.
2016-04-27 20:04:36 +01:00
1b5b18c9b2
Prevent exception while adding variables to gamemodes
2016-04-27 17:50:01 +02:00
aa219ec3e5
Implement gamemode feature with modifiable variables and working on first moded games
2016-04-27 17:42:50 +02:00
ddad17855f
Improve chicken spawning on chicken shooting
2016-04-27 18:37:42 +03:00
f8ff99fc58
Increase hologram height gain and expire time
2016-04-27 18:37:09 +03:00
e3a6a0a50a
Fix spawns and map generation on smash off
2016-04-27 18:36:16 +03:00
c6b1065c4e
Fix scoreboard player team after death
2016-04-27 18:35:39 +03:00
9407265c73
Display predefined items on diamond hunt
2016-04-27 14:02:43 +03:00
ba5d06db88
Fix tag master and achievement progress
2016-04-27 13:14:20 +03:00
a16145479e
- Disabled picking up lava
...
- Leaving ranked matches temp bans players from rejoining them
2016-04-27 03:18:44 -04:00
ccebeb75f1
Implement challenge team spawning
...
Team based challenges are now handled differently from the normal ones.
When the game or challenge starts, instead of spawning all players
with the default team spawn method, they are teleported according
to their team. For example, if a player is on the blue team, he
will be teleported on the blue side of the map. Moreover, teams
are now generated properly, by diving the total number of players by
two. One drawback, that will be fixed in a next commit, is that team
challenges require an even amount of players.
2016-04-27 09:41:02 +03:00
d0e7590b2a
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-04-26 23:23:45 -03:00
a7ef8bec49
Adds new constructor to NotePlayer, to be able to send the song to specific players
...
Some WindUp costume fixes
Added actionbar and song to WindUp suit
Created new booster manager
2016-04-26 23:21:59 -03:00
38d03b8468
Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics
2016-04-27 00:03:29 +02:00
79f210e242
Schematic and WinEffect update
...
+Added better schematic support
+Fixed schematics not sending block updates to nearby players
+Added win room schematics
*Tweaked some of the win rooms
+Added sounds to the Lava Trap win effect.
2016-04-27 00:01:30 +02:00
41e2ea6490
Fix off by one error in GoalCounter
2016-04-26 16:20:14 +10:00
714000163b
Add messages when fountain is complete and resets
2016-04-26 16:19:27 +10:00
4a8c38e1c8
Add fountain reset command
2016-04-26 15:33:52 +10:00
cabf4c4c8b
Add BlockProgressBar for Gem Fountain
2016-04-26 15:26:07 +10:00
e8370579c0
Counter refactoring
2016-04-26 13:55:06 +10:00
38769d9616
Add missing tracker classes
2016-04-25 23:01:41 +03:00
d945bfa17a
Fix array out of bounds on veteran tracker
2016-04-25 23:01:17 +03:00
d0336be7b7
Add new achievements and modify current ones
2016-04-25 22:59:24 +03:00
41ef1a757c
Prevent null winner on veteran tracker
2016-04-25 18:03:25 +03:00
7c92971346
Remove new thread and use bukkit runnable only
...
Previously, a new thread was created to display the description
of a challenge. Instead of creating a new one, only a single
bukkit runnable is now created. With that change, when the challenge
is skipped, the correct description will show up instantaneously.
2016-04-25 18:00:37 +03:00
a6bf059e6c
Modify challenge names and challenge intro titles
2016-04-25 12:47:55 +03:00
f0cfac8e73
Merge pull request #31 from Mineplex-LLC/develop
...
Merge from develop
2016-04-24 23:15:36 -03:00
28de514d1a
Adds some utils for UtilColor
...
Small changes in Wind Up suit
2016-04-24 21:39:35 -03:00
c214431cbf
Move and rename stat trackers
2016-04-24 22:44:42 +03:00
856eb6059b
Update statistics and implement data tracker
2016-04-24 22:39:56 +03:00
949f9ca712
Don't allow players to report themselves
...
I left this to last minute to make testing easier, as with this check
in place it means at least two players are required to test the report
mechanism.
2016-04-24 18:10:01 +01:00
96aa5d1c4b
Removed duplicate code
...
Somehow this got duplicated and so therefore was causing compile time
errors, might have been something to do with my git merge.
2016-04-24 17:22:21 +01:00
dab1f9485c
Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
2016-04-24 17:17:17 +01:00
9df4dac023
Remove dead code
...
This was left over from before I took over development of the report
feature.
2016-04-24 17:16:36 +01:00
713263214f
Run ReportPurgeTask asynchronously
...
This prevents the task from hanging the server which may be an issue
when a large amount of reports exist.
2016-04-24 17:15:12 +01:00
57e9cd6e19
Add class headers and remove @author tags
...
This makes the PR compliant with with the Mineplex coding style.
Class headers are used to describe the function of a class and git
history will be used to determine the author of a class.
2016-04-24 17:10:29 +01:00
e2a6500bce
Update game achievements
2016-04-24 13:37:39 +03:00
a0fd852537
Move field to top of class in Game
2016-04-24 13:38:58 +10:00
b21dfad12e
Merge remote-tracking branch 'remotes/origin/develop' into feature/gems
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
2016-04-24 13:37:45 +10:00
c60beec68c
Implement Fountain GUI
2016-04-24 12:40:38 +10:00
491c509317
Added UnlockCosmetics command (/unlockCosmetics <type>)
...
Added Ammo command (/ammo <gadget> <ammo> [player])
Added util for red world border screen (UtilPlayer.sendRedScreen)
Added new costume -> Wind Up
Removed test gadget (ItemBouncyBall)
2016-04-23 22:16:02 -03:00
bfabfab2d1
Fix circle spawn locations
2016-04-24 00:27:39 +03:00
b21939444c
Some changes to error handlng for clans regions
2016-04-23 16:40:39 +10:00
c7970d1bd0
Prevent super paintball spectators from reviving teammates. Fixes PC-103
2016-04-22 19:48:03 -05:00
ccd630e2ae
Leftovers from merge
2016-04-23 00:56:19 +02:00
b7099088a9
Merge remote-tracking branch 'origin/develop' into project-cosmetics
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/block/schematic/Schematic.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguisePlayer.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/data/TNTGenerator.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/MiscManager.java
2016-04-23 00:55:48 +02:00
c526c86813
Add notes to fix recent bugs
2016-04-22 23:26:53 +03:00
fa75bc15ad
Merge branch 'develop' into thanos-mineware
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
2016-04-22 22:03:15 +03:00
fe0cee65e8
Added gem and coin rewards back into bonus.
2016-04-22 05:33:25 -05:00
260c617007
Merge remote-tracking branch 'remotes/origin/alex-mcl' into develop
2016-04-22 05:12:30 -05:00
e28621ae26
Set oldElo equal to new elo on new row.
2016-04-22 05:04:13 -05:00
2a4c3209b4
- Enable ELO
2016-04-22 05:44:56 -04:00
70541fd6f2
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla
2016-04-22 05:41:24 -04:00
d73b720323
Merge branch 'features/elo' into develop
2016-04-22 04:34:35 -05:00
477acf044e
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
2016-04-22 04:34:21 -05:00
6db7e648f5
Don't insert new row if the update doesn't succeed because of elo mismatch on loss.
2016-04-22 04:20:59 -05:00
7b18efa7b0
Prevent farming elo up with multiple games by dc and joining new game.
2016-04-22 04:05:07 -05:00
ddd1c5af9b
Removed EloSettings and fixed scoreboard.
2016-04-22 03:10:09 -05:00
34f94c0381
Reverted scoreboard because of MC maxlines turd nugget.
2016-04-22 02:55:27 -05:00
a31eccc15b
Multiply new rating by team size. MIssed that undo!
2016-04-22 02:53:02 -05:00
4577cf0398
Fixed scoreboard :D
2016-04-22 02:47:48 -05:00
7cc4811ede
Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into features/elo
2016-04-22 02:39:35 -05:00
f922be51fe
Scoreboard tweak.
2016-04-22 02:39:08 -05:00
04fe30df43
- Fix sb
2016-04-22 03:38:20 -04:00
5e255fc4ed
Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix
2016-04-22 03:36:21 -04:00
757c945320
Added in kFactor ratio application to rating delta.
2016-04-22 02:35:37 -05:00
03bdc8d2db
Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix
2016-04-22 03:17:54 -04:00
b69a75355c
Fixed scoreboard alignment.
2016-04-22 02:17:40 -05:00
aa6d25139f
Tweaked elo for team games.
2016-04-22 02:04:57 -05:00
b1c05e2ed0
Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix
2016-04-22 02:12:02 -04:00
776093288a
Fixed rating not setting in EloPlayer constructor.
2016-04-22 01:11:48 -05:00
2d2c8858e6
Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix
2016-04-22 02:06:55 -04:00
1d3ad3c5fd
- Enabled ELO for testing
2016-04-22 02:06:37 -04:00
977fbe684a
Fixed elo query.
2016-04-22 01:06:33 -05:00
44d4255628
Added endElo in the appropriate spots.
2016-04-22 00:58:07 -05:00
6d00e8b41f
Refactored Elo to work correctly.
2016-04-22 00:21:11 -05:00
8a5fdccb60
Add to fountain button
2016-04-22 11:26:05 +10:00
d0e3b094c1
- cleaned up and prepped for live update
2016-04-21 20:57:35 -04:00
86df07123c
Merge pull request #28 from Mineplex-LLC/bugfix/admin-command-npe
...
Fix NPE in AdminCommand from IncognitoManager being null
2016-04-22 10:54:20 +10:00
e46798f20e
Fix NPE in AdminCommand from IncognitoManager being null
2016-04-22 10:49:34 +10:00
e55bec505b
- Fix players ending up teleported back to arena due to broken respawn engine
2016-04-21 20:13:39 -04:00
435d3968a2
Fix Fountain string being changed to Counter from refactor
2016-04-21 19:46:20 +10:00
df55d48ab8
- Looks better
2016-04-21 01:03:14 -04:00
d57cc48f0f
- Added new features!
2016-04-20 22:31:54 -04:00
f86b18b603
Elo Works Now
...
Ready to move on to MCL implementation
2016-04-20 22:09:18 -04:00
54f0b99756
Add fountain gui command
2016-04-21 11:41:16 +10:00
2d02d79cec
Fix survival games' Beastmaster wolf spawning
...
Beastmaster wolf spawning suffered from the same issue as the Wizards
"Summon Wolves" spell: spigot has an issue when setting an owner to a
wolf or ocelot without a previous owner. See SpigotUtil for details.
2016-04-20 18:45:54 -05:00
2d45ab61cc
Elo re-calculated
...
Elo is now being incremented more consistently (and not multiple times)
2016-04-20 15:48:27 -04:00
6a5c8336cf
Elo and Division fixed
...
Elo and Division should be displaying properly
Cleaned the code up a bit
Added endElo() to Game.java to handle team Elo code
Added event listener to check for GameState.End in TDM to call endElo()
2016-04-20 14:52:06 -04:00
588e6f08c2
- Removed TypeWars achievements to make room
2016-04-19 18:07:20 -04:00
6e011b3a89
Add missing SpawnDefinition interface
2016-04-19 21:52:45 +03:00
793f5b3f41
Test gadget added by LCastr0, to get used to the code
2016-04-19 15:20:31 -03:00
2b80ebabf7
Test gadget added by LCastr0, to get used to the code
2016-04-19 15:14:22 -03:00
cb4561c561
Implement team check on challenge selection system
2016-04-19 18:25:36 +03:00
11aef273ba
Fix NPE on Volley Pig
2016-04-19 18:25:04 +03:00
50175f9453
Spawn players with equal distance from ladder on KOTL
2016-04-19 14:27:48 +03:00
17c51f03ad
Remove grass only from used spawns
2016-04-19 14:17:32 +03:00
20fdb1f21c
Restructure methods on Mini OITQ challenge
2016-04-19 13:59:09 +03:00
816abad8de
Fix Mini OITQ barriers enclosing players at spawn
2016-04-19 13:57:39 +03:00
ef8474ae9d
Set default CustomExplosion maxFallingBlocks to 0
...
This fixes an exception thrown when the trap rune in Wizards is
activated.
2016-04-19 02:59:31 -05:00
bda9772ba6
Mitigate spigot issue when setting wolf owner
...
This fixes the Summon Wolves spell in Wizards.
Explanation:
- Wolves keep track of their most recent owner.
- When a wolf is assigned a new owner, it updates the data
watcher with the new owner's UUID
- During this process, the old owner's UUID is checked
against the new one
- If the wolf didn't have a previous owner, the old owner's
UUID is the empty string.
- UUID.fromString() is called on the empty string, and throws
an exception.
2016-04-19 02:46:38 -05:00
09fb1842b6
Apply improvements and bug fixes
2016-04-19 10:00:06 +03:00
cb48df6a3d
Update fountain count every 5 seconds. Display Hologram
2016-04-19 14:30:38 +10:00
6dc2559dd1
Merge remote-tracking branch 'remotes/origin/md_5/boosters' into feature/gems
2016-04-19 13:57:33 +10:00
5a667a7d31
Add /fountain command. Fountain implementation
2016-04-19 13:57:19 +10:00
e08965aa25
- Fixed TowerDefender being too difficult to obtain
...
- Fixed wither attacking own towers by accident
2016-04-18 22:58:55 -04:00
6c20427395
- Fixed some bugs and added final achievements
2016-04-18 22:32:15 -04:00
17ac3cb597
- Fix armor checking
...
- Edit wither death message
2016-04-18 20:29:53 -04:00
10aba533f3
- Remove all dependence on UtilShapes
2016-04-18 19:59:55 -04:00
34399db6e8
- Fixed missing GameType
2016-04-18 18:42:56 -04:00
d9b6434bad
Typo in description
2016-04-18 23:24:59 +02:00
534a5dee4e
Forgot to remove debug message
2016-04-18 22:18:42 +02:00
591d3cadc9
Cleaned up some GUI stuff, mostly lores on items
2016-04-18 22:16:10 +02:00
e45f800519
Fixed damage calculator error
2016-04-18 20:36:22 +02:00
9de990744d
Stage
2016-04-18 17:46:38 +10:00
44263beb87
- Make elo store/recover properly
2016-04-17 17:34:18 -04:00
4227e24ae0
Reintroduce non-Air constraint to cannon explosion
2016-04-17 16:29:23 -05:00
e375db5aec
Refactor cannon explosion effect for clarity
2016-04-17 13:33:44 -05:00
ee30012011
Merge branch 'feature/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix
2016-04-17 12:27:23 -04:00
d623d0982b
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla-merge
2016-04-17 12:02:08 -04:00
4c35e35fc0
- More polish and bugfixes
2016-04-16 23:59:44 -04:00
4477a215f4
Update to Redis 2.8.1 and clean up repositories ( #26 )
2016-04-16 22:51:20 -05:00
fed9f675d3
Implementation for basic Fountains
2016-04-17 13:51:15 +10:00
9c2cd6a883
Merge branch 'feature/redis-update' into feature/gems
2016-04-17 13:08:11 +10:00
16dacbe3b3
Update to Redis 2.8.1 and clean up repositories
2016-04-17 12:58:44 +10:00
35d7dd8b44
- Fixed stuff
2016-04-16 20:36:19 -04:00
b0d30a4ff4
- cleaned everything up
...
- renamed game
2016-04-16 20:32:14 -04:00
d8f5ac66fc
- More chiss
2016-04-16 14:05:46 -04:00
696088b57e
Fixed gun stats between games
2016-04-16 18:16:53 +02:00
9c6d23f11e
Correctly count cannon explosion effect attempts
...
Previously, cannon explosions effects could lock up the main thread if:
- The effect location selection RNG was sufficiently unlucky
- The explosion occured sufficiently deep into a larger claimed
territory
2016-04-16 07:31:00 -05:00
cb4e25fb0a
Implement new challenge selection system
...
The new challenge selection system, picks a random challenge from
the list as a starting point. Once the challenge is ended, the next
one in the list will be selected. That process continues, until the
index is out of bounds, and from that point, a new starting point
will be selected. During that process, any challenge that is picked,
is also reviewed to make sure it's suitable according to the player
count. If that's not the case, the selection process will continue
until one challenge is found. If there is no appropriate challenge,
the game will be ended.
In addition to those changes, there are a couple of bug fixes and changes.
At first, some methods that keep track of player lists were renamed and
secondly, the enchantment lore is now hidden on challenges that use items.
2016-04-16 15:13:52 +03:00
bbb81dd663
Elo calls migrated to Game.java
...
Consequently, elo code is actually being called now
Bukkit.broadcastMessage calls have shown where things are breaking
handleElo() added to EloManager to facilitate movement of team elo code
preparing to use EloManager's getNewRatings() method to
calculate team elos
2016-04-15 20:48:56 -04:00
ffc0459e5a
Cosmetic Update
...
+ Support for relative copy position from with //copy from worledit in
schematics
+ Better block selection in bounding box in UtilBlock
+ Goal selector utils for entities
+ Global hide and show methods for players
+ Win effects and game modifiers
+ Tweaked player disguises
+ Added clean room generator to arcade games, previously normal flat
world
+ Animation utils
* Edited some particles, hats and death animations
2016-04-16 02:24:41 +02:00
2b2b251548
Merge branch 'clans/beta' into develop
2016-04-15 12:41:14 -05:00
019cfe41cc
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-15 12:40:54 -05:00
609eb562e9
Merge branch 'clans/beta' into develop
2016-04-15 12:40:26 -05:00
a730b81feb
Commented out TournamentManager, moving off develop.
2016-04-15 12:38:25 -05:00
b43953439e
Properly store teamId locally after registering for tournament.
...
Use team id when unregistering for the tournament.
2016-04-15 12:36:28 -05:00
cf3141ddc0
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
2016-04-15 12:30:32 -05:00
77b6515387
Don't break the repair anvil more than twice
2016-04-15 12:21:25 -05:00
91d5851628
Don't set a clan's lastOnline time to Timestamp(0)
...
Partially reverts f011fdad5f
2016-04-15 12:21:25 -05:00
09f9ae3b7a
- Update for playability
2016-04-14 23:05:14 -04:00
33b557eb10
- Huuuuuuuge amount of changes for chiss
2016-04-14 22:45:21 -04:00
4a4e64a3ff
EloRepository overhaul started
...
Tinkering with EloRepository, using AccountRepository as a base
2016-04-14 20:09:09 -04:00
64d5f91e8f
Remove TeamInvite table.
2016-04-14 18:49:20 -05:00
0a32eed15d
Fix Cannon TNT firing in the wrong direction and clean up the projectile code, making it more modular.
2016-04-15 00:43:55 +01:00
742807d80e
Added generatePlayerElos and updated saveDivision
...
Added method to fill EloManager's playerElos hashmap with values
--This may not work as intended
--Currently only implemented in Team Death Match
2016-04-14 17:17:26 -04:00
eb67c12108
Added getRepoElo to EloRepository
...
Added Bukkit.broadcastMessage() calls to test code
Methods that needed to throw SQLExceptions now throw SQLExceptions
2016-04-14 15:21:28 -04:00
3a26225ce2
Finished main tournament calendar UI.
...
Added registration for tournaments.
2016-04-14 12:21:24 -05:00
29b3f03abf
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-14 21:38:48 +10:00
cbc6689782
Disable /kill in tutorial and reset food level after hold position
2016-04-14 21:38:37 +10:00
eab76fefa2
Fix Cannons sometimes glitching out when the owner's clan is deleted.
2016-04-14 12:09:42 +01:00
3bf3eba005
Completely cancel the explosion falling block for claimed territories.
2016-04-14 12:08:54 +01:00
a295cade1c
Fix Cannon TNT sometimes breaking blocks in protected regions
2016-04-14 11:35:12 +01:00
ab21efd2ca
Give the correct amount of old/ancient chests for bonuses
2016-04-13 18:51:52 -05:00
6b2f601c7a
Prevent a spectator race condition in arcade games
...
Previously, a player would erratically become a spectator if s/he
spammed the "spectate next player" action between rounds (i.e.
left-click while spectating a player).
2016-04-13 18:20:39 -05:00
9e8a7b582b
Elo updates
...
EloRanking turned on for Domination, Team Deathmatch, Turf Wars, CTF
Database QoL changes made to EloManager and EloRepository
--Unfortunately, Database still seems to not be updating properly
--Something on my end, or something to do with the queries? Unsure.
2016-04-13 18:35:56 -04:00
6d01e235fd
Fix online friends list
...
Previously, it was incorrectly asserting that all players were
incognito. If we want to exclude incognito players, we'll have to find a
different way.
2016-04-13 17:24:46 -05:00
85f4ff1299
Starting on Tournaments.
2016-04-13 17:14:48 -05:00
91c97e38b8
Prevent players from naming their pets "ULTRA"
...
This was being used to fool support into thinking the player had won
Ultra from a chest
2016-04-13 16:37:13 -05:00
b54da22dd8
Create a basic site design for potential job applicants.
2016-04-13 21:06:47 +01:00
7cc0583d8e
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-13 19:52:49 +01:00
355ab06e6c
Fix the Conquering attribute working for player attacks as well
2016-04-13 13:08:04 +01:00
a26403f006
Fix Recall & Smokebomb not working regularly
2016-04-13 13:04:43 +01:00
6428dfd723
Run clan-load callbacks on the main thread
...
This prevents potential CMEs from occurring when a player transfers
his/her clan to another server
2016-04-12 22:54:20 -05:00
e9d05474f8
Prevent cannons from changing bedrock into charred blocks
2016-04-12 17:14:48 +01:00
c0ebae4175
Ender chest blocker not actually canceling the opening event.
2016-04-12 17:13:03 +01:00
11d92c49ec
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-12 09:48:59 +10:00
eefed175ec
Add the random world event command.
2016-04-11 18:07:11 +01:00
b313bc5308
Make undead chests not show the 'you are not permitted to use ender chest' messages.
2016-04-10 16:52:54 +01:00
313b59d1d6
Fix the terrain finder miscalculating the size of undead camps
2016-04-10 16:51:42 +01:00
e014f4fff9
Fix null pointer in the tutorial when using /tutorial finish
2016-04-10 16:51:12 +01:00
159a5403ac
Fix rare item duplication bug with Smoke Bomb (was told that it's just like the Recall duplication bug)
2016-04-10 16:47:46 +01:00
db8ca31567
Fix Meridian Scepter not being perfectly accurate.
2016-04-10 16:16:53 +01:00
0ac9747df1
Modifying how the Meridian Scepter picks a target, as the previous logic was a bit flawed.
2016-04-10 15:27:20 +01:00
9a2f4a8936
Fix Meridian Scepter not damaging the victim (would just give the wither effect)
2016-04-10 15:23:43 +01:00
fe89a5b68e
Fix the Recall rare item duplication bug
2016-04-10 14:50:00 +01:00
67a36dc7e4
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-10 12:56:30 +01:00
66274188c8
Add a /we random command to spawn a random world event
2016-04-10 12:56:00 +01:00
37bb64bffd
Fix Undead Camps from spawning outside of the World Border.
2016-04-10 12:47:56 +01:00
3ee1f86841
Fix Null Pointers in the ender chest blocker and regular chest blocker for incognito staff.
2016-04-10 12:36:31 +01:00
8ee2c02dd9
Disable the use of Ender Chests
2016-04-10 11:20:51 +01:00
e8e73306be
Change the Giant's Broadswords regeneration effect level from 41 to 3
2016-04-10 11:15:43 +01:00
dd3e009413
Remove silent chest opening mechanism (which was completely broken), and instead don't allow incognito staff to open chests
2016-04-10 10:53:07 +01:00
ccf9d4a4c2
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/repository/SiegeWeaponRepository.java
2016-04-09 13:01:04 -04:00
ea6219984a
Add missing Spleef challenge to removed package
2016-04-09 11:06:46 +03:00
0b780c8e99
Fix teleport delay and incorrect win placement.
...
Players that die during a challenge have the ability to fly
around as spectators. Although, once the challenge was ended
their fly mode was removed and they would fall for a very short
amount of time, which was noticeable. With that fix, players
now get reset once they are teleported to the spawn locations
of the next challenge. That happened because during the player
reset and spawn teleportation, the map would be generated, as a
result, causing a very small notable delay.
Moreover, win placement was fixed. In the previous version, the
third player would appear as second and the second player would
appear as the third one. The cause of this issue was that, after
the second and the third player is added to the winner list, the
last player that is remaining alive is added as first. To fix that,
I've implemented a swap method that changes the location of the
second with the third player.
2016-04-09 11:04:23 +03:00
4bf19eebad
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-09 00:37:40 +01:00
92195a12d2
Completely rework Cannon explosions to use the vanilla Minecraft explosions, as those seem to look much more visually appealing, and have less issues.
...
Fixed a loading and saving bug with Cannons, they seem to be a lot more stable now than before.
2016-04-09 00:37:20 +01:00
6e9ae04118
Cut Gem to Gold conversion rate down to 16 Gems per Gold, instead of 32
2016-04-09 00:27:24 +01:00
8b6b3db412
Remove old pre-mavenisation files
2016-04-09 00:17:58 +01:00
6efb8d806d
Re-enable category threshold check
...
This was disabled for testing reasons.
2016-04-09 00:02:59 +01:00
05b31725a8
Fix initialization NPE.
2016-04-08 18:48:16 -04:00
a04f7c23c6
Disable incognito for staff in hub invisibility, and vice-versa
2016-04-08 20:18:56 +01:00
8a2efa2f0b
Make sure a user has enough gold to make a purchase.
2016-04-08 10:48:55 -04:00
79a2ef3608
Fix staff members getting unhidden when in incognito whenever players are shown to the player (can happen when a regular player toggles player vision, and the staff member gets shown to all other players.)
2016-04-07 22:24:47 +01:00
59001bdef6
Fix merge-related errors
...
Fix, polish, and re-implement Elo code.
2016-04-07 16:40:30 -04:00
2c05743f62
Stop using static with Siege Manager
2016-04-07 21:01:25 +01:00
36e79a1504
Add header to every class as per new coding standards.
2016-04-07 14:44:27 +01:00
390b2878dc
Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-04-07 14:28:30 +01:00
c484a80a14
Remove incorrect import
2016-04-07 08:12:05 +01:00
b70ff03185
Fix siege weapon crater being spawned at the lowest block at the current collision location.
...
This was causing issues when Cannons were fired at a vertical wall, and would not do any damage to the wall as it would just do damage to the blocks at the nearest ground block.
2016-04-07 08:11:37 +01:00
f2ac2d87bf
Remove debug command, that could be very abused
2016-04-07 08:07:18 +01:00
9ccec50fd0
Remove unnecessary database calls that checked for siege weapons remaining in the database, which is not possible, as siege weapons clean themselves up.
2016-04-07 08:06:16 +01:00
eed3df720a
Disable incognito mode for staff members that have been demoted whilst using it.
...
Also fixes a bug that caused IncognitoHidePlayerEvent fire even if the player logging in does not have incognito mode enabled.
2016-04-07 07:00:46 +01:00
3a8ab581dd
Add JavaDoc to new classes to comply with the new standards
2016-04-07 06:52:52 +01:00
91e550bdcc
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/outpost/Outpost.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/SiegeWeapon.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/command/FinishCommand.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/command/TutorialCommand.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/BlowUpWallGoal.java
2016-04-06 19:40:01 -04:00
a07e71ba08
GameOption takes a generic value to eliminate the need for more than the one GameOption class.
...
Remove the--now unnecessary--classes that inherited from GameOption.
Consequently, the creation and implementation of GameOptions should be much more efficient.
Note: it may be necessary to add decimal points to doubles and to cast 'long' data types as 'long'.
The above note generally applies to numerical values, but may apply to other values, as well.
2016-04-06 18:10:31 -04:00
f030f78f08
Add headers to new classes, so as to comply with coding standards.
...
To that end, change methods to camel case and refactor them, so that the newly-renamed methods do not result in errors.
2016-04-06 16:20:26 -04:00
d75d63a81a
some missing files and blacklist barrier block from block toss
2016-04-06 18:26:56 +01:00
8b42de03cb
Debug messages for PoisonShock
2016-04-06 10:39:00 -05:00
d25f1abfbf
stop iron door from being opened by players not in clan (outpost)
2016-04-05 23:49:16 +01:00
738825ea9d
perms for tutoirial command
2016-04-05 23:37:08 +01:00
4bdd33c87b
blowing holes in the ground and interacting with cannon sometimes not working
2016-04-05 23:15:38 +01:00
744d8891b4
import
2016-04-05 22:58:03 +01:00
09db5a8131
I'm committing this so I can checkout to a different branch
2016-04-05 16:41:50 -04:00
c6c52885a9
Fixed commit
2016-04-05 15:16:40 -04:00
be63012d18
make trainees+ not count to kicked player count
2016-04-05 12:43:19 +01:00
876a7a8eb6
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-05 12:37:23 +01:00
cfac41f216
full server trainee+ fix
2016-04-05 12:37:04 +01:00
dd5b2d5e3f
Fixed NPE with poison condition effect.
2016-04-05 00:36:18 -05:00
e23362bd6f
Fixed NPE in OrderedObjective
2016-04-05 00:36:00 -05:00
b34a175a2b
Fixed error in Outpost throwing NPE.
2016-04-05 00:35:44 -05:00
ae87db1742
Fix TNT generator timings
2016-04-05 13:04:52 +10:00
23232efd63
Merge remote-tracking branch 'remotes/origin/develop' into clans/beta
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
# Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java
2016-04-05 13:04:39 +10:00
b0dd51843b
Ride horse delay
2016-04-05 10:58:31 +10:00
7f92a3c048
incognito changes
2016-04-05 00:38:27 +01:00
cd5ad89f51
Made clans sort by server number.
2016-04-04 17:46:51 -05:00
53b25e6ee0
Fixed diamonds not selling in shops.
2016-04-04 17:46:35 -05:00
6558b16004
Fixed endless loop crash bug with Gear attributes.
2016-04-04 17:46:22 -05:00
8ea0051181
Fixed customer support menu not showing if monthly bonus hasn't been claimed.
2016-04-04 17:46:03 -05:00
2d296d9226
Removed debug ResourcePack Message
2016-04-04 17:45:34 -05:00
efa18d394b
Fixed Incognito not saving status.
2016-04-04 17:45:10 -05:00
2fa0787792
Clans now load, added connection property to null zero date timestamps.
2016-04-04 16:31:37 -05:00
2b3e466469
Removed pesky '?' causing login query to stall.
2016-04-04 16:30:57 -05:00
7de23216f6
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-04 20:41:10 +01:00
b3b72f1ca0
commenting out clans bans
2016-04-04 20:40:58 +01:00
02459c6a10
Fixed bad implementation of IncognitoManager that was locking up threads.
...
Temporarily disabled MessageManager's handling of Incognito.
2016-04-04 13:48:26 -05:00
60010f90b4
Load simple clan token on player login to reduce overhead.
...
Increased dbpool connections to 4
2016-04-04 13:47:45 -05:00
a91ef68978
Fixed CCM in WarPointEvasion.
...
Removed debug message; NOT RIDER
2016-04-04 13:46:39 -05:00
e2baf2b56c
Updated Clans to use the new ResourcePackManager.setResourcePack method.
2016-04-04 13:46:00 -05:00
1b1e6f6ef5
Moved the redis operation before asking for a mysql connection
2016-04-04 13:45:20 -05:00
781c4bfdbd
Removed db call off main thread for ClanServerPage
2016-04-04 10:31:13 -05:00
91ddac9643
Added world checking for boundary stuff.
2016-04-04 10:30:59 -05:00
e8da5ca0f2
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-04 10:02:01 -05:00
228a001696
Added Shift Left clicking to the ban list for Cannon :D
2016-04-04 10:01:50 -05:00
ff929a8515
Merge remote-tracking branch 'remotes/origin/develop' into clans/beta
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
# Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java
2016-04-05 00:57:28 +10:00
14207c2073
clansbans
2016-04-04 14:56:20 +01:00
8330ef560d
not rider spam
2016-04-04 14:55:47 +01:00
fecd3c1eaa
Final changes
2016-04-04 23:28:38 +10:00
02cb0e1f7e
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java
2016-04-04 13:52:44 +01:00
1dde17b9cc
shooters still shotting fix
2016-04-04 13:51:05 +01:00
e85a1e6a3b
fixes to breakingand placing in claim
2016-04-04 22:22:07 +10:00
4262a4d4b7
Increase radius + delete iron doors after done
2016-04-04 22:07:58 +10:00
963bba06f7
fix for displaying territorial movements
2016-04-04 17:47:58 +10:00
2e0c9d3965
Remove potatoe message
2016-04-04 17:34:39 +10:00
aaccb6fd48
Join/leave/death messages
2016-04-04 17:20:21 +10:00
15c4b2dd58
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-04-04 17:11:15 +10:00
23e116f9b5
Region fixes
2016-04-04 17:10:52 +10:00
56a087612b
Changes to explain energy goal
2016-04-04 16:58:16 +10:00
be8ed78caa
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-04-04 16:46:17 +10:00
02f774ce94
A lot of bug fixes
2016-04-04 16:45:20 +10:00
85fabd525a
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-04 00:59:25 -05:00
400d2f0cca
Added bonus log view for customer support.
2016-04-04 00:59:13 -05:00
543719b95d
More tutorial fixes
2016-04-04 14:47:33 +10:00
040026724b
renamed tutorials
2016-04-04 14:10:26 +10:00
29bcd6aeea
more text cahnges
2016-04-04 13:30:15 +10:00
88e56f2ffb
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FieldsObjective.java
2016-04-04 13:03:24 +10:00
6c92b42335
text changes
2016-04-04 13:01:54 +10:00
29f2442be8
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-04-04 12:53:07 +10:00
8dee8eab0a
Bug fixes
2016-04-04 12:52:52 +10:00
3173adca53
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-04 12:49:00 +10:00
5ad877f864
So many fixes <3
2016-04-04 12:47:23 +10:00
0a39b7b756
Fix objective ordering
2016-04-04 12:36:47 +10:00
e11a9379b9
More tutorial tweaking
2016-04-04 12:32:22 +10:00
5195e4a13d
Message fixes
2016-04-04 10:15:15 +10:00
c3a119cfe4
Display completion only to player who completes
2016-04-04 10:11:26 +10:00
a1f284670a
make zombie npcs actually look at the player
2016-04-03 23:49:22 +01:00
3ff5e6d337
npc fixes
2016-04-03 18:47:31 +01:00
7558bd01b7
ensure zombies don't burn to death, by losing equipment
2016-04-03 18:29:13 +01:00
40361acc9b
fixed cannon becoming off-center
2016-04-03 17:51:56 +01:00
ccdd1f901f
cannon 1.9 fixes
2016-04-03 17:23:55 +01:00
cc68b7087a
Change wool color on Wave Crush challenge
...
During map generation, the wool color is now predetermined and not
random.
2016-04-03 17:15:20 +03:00
18ff9c23f7
Modify block removal from Wave Crush challenge
...
The removeExtraBlocks() method was changed, in order to include all
arena blocks. The previous version did not remove all extra blocks,
as it was using the getArenaSize() method inside the for-loop, which
returns a different integer depending on the challengers.
To fix that, I've implemented the '_arenaStartSize' field to store the
starting arena size value that is used in the map generation method.
2016-04-03 16:53:14 +03:00
114fac2655
Refactor Red Light Green Light challenge
...
Separated functionality into different methods in order to improve
readability and maintainability. All four abstract methods were
updated, in order to make sure they work as intended without any
second thoughts.
Moreover, a PlayerQuitEvent listener was added to remove players from
the '_cooldown' array list and a null check in the onEnd method, to
prevent any null pointer exceptions.
Also, there were some minor display changes, regarding titles and chat
messages on the moveTextAndSound() and cannotMoveTextAndSound() methods.
Lastly, the bedrock layer was removed from map generation.
2016-04-03 16:49:31 +03:00
f4d4b5c5df
siege weapon interaction fix
2016-04-03 14:08:40 +01:00
66a18dcc87
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/ClansMainTutorial.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java
2016-04-03 13:55:17 +01:00
c1b659e738
npcs on enemy base
2016-04-03 13:50:11 +01:00
f5623f00f9
blacklist npe fix
2016-04-03 13:47:57 +01:00
3ae347653a
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-03 21:33:13 +10:00
c92d291e96
Shift clicking TNT into the cannon + iron doors fixed
2016-04-03 21:32:56 +10:00
8f58a456b1
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-03 01:37:40 -05:00
401127caa9
Reworked Monthly bonuses so they always succeed and it logs them.
2016-04-03 01:36:30 -05:00
759911396a
More clans bug fixes + message tweaks
2016-04-03 16:11:47 +10:00
5e41c22fc7
- The "WARNING: Clan energy is running very low" message should appear after I get the Buy Energy objective
...
- Need a congrats message/title when tutorial is completed
- Force user to claim via gui
2016-04-03 13:39:32 +10:00
45cbeef83d
- /c sethome shows the wrong message when the bed can't be placed
2016-04-03 13:32:49 +10:00
9f4a2ff7ce
- Shift clicking TNT into the cannon does not work
...
- /c map doesn't work in tutorial (could just remove /c map completely)
2016-04-03 13:31:13 +10:00
664d8b1a4e
Fixes for clans tutorial
2016-04-03 11:04:57 +10:00
f454a6de81
Comment game classes and remove unnecessary checks
...
Added comments on game classes, except challenges
and statistics trackers.
Removed challenge validity checks from onCollide method in Anvil Dance
and Falling Blocks, since that is now handled on the Collide method
located in the main game class.
2016-04-02 22:49:56 +03:00
12b90501e2
Refactor Wave Crush challenge
...
Separated functionality into different methods in order to improve
readability and maintainability. All four abstract methods were
updated, in order to make sure they work as intended without any
second thoughts.
Also, a new PlayerQuitEvent listener is added, in order to remove
players from the '_survivedWaves' hash map, which keeps track of
the waves every player survived.
Lastly, onCollide if-statement logic was reversed to reduce and
simplify the lines of code inside the method.
2016-04-02 22:10:43 +03:00
b4cfbebf3f
Fix issue with seeling potatoes
2016-04-02 22:53:41 +11:00
d4e9f638da
Fixed a crash bug with title message being too long + other fixes
2016-04-02 22:26:21 +11:00
cc09bf6b51
Fixes to Bull Charge + Adding more instructins to purchasing
2016-04-02 21:43:33 +11:00
15cf7f574d
Fix join/quit messages.
2016-04-02 11:08:40 +01:00
6072753624
Fix shop objective description.
2016-04-02 10:50:46 +01:00
b960925522
Fixes
2016-04-02 20:42:41 +11:00
5a31be1138
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-02 20:33:09 +11:00
673dd327ff
Push for shaun Fireworks
2016-04-02 20:29:56 +11:00
e4b2492b35
Fixed ObjectiveGoal's finish from creating CCMs.
2016-04-02 03:03:17 -05:00
ff41ad248a
Removed PvpTimer
...
Fixed issue where StatManager and FriendManager were created twice.
2016-04-02 02:47:17 -05:00
a6710280fb
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-02 00:45:10 -05:00
01d9c1cd09
Finished the <?> for Objective and ObjectiveGoal.
2016-04-02 00:45:01 -05:00
d161d83d12
Maps and other various fixes
2016-04-02 15:43:03 +11:00
5739b1b87b
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-04-02 15:13:16 +11:00
3bc1908b57
Fix player quit staying in _active list for Objectives.
2016-04-01 23:10:15 -05:00
758004f207
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-04-02 14:55:14 +11:00
fa6d18b0fa
Fix sync db call inside sendMessage
2016-04-01 22:43:09 -05:00
8f959a73eb
debug
2016-04-02 12:46:25 +11:00
9969b7d783
support for resource packs for different MC versions
2016-04-02 11:39:40 +11:00
0abcd0044b
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-04-02 10:53:28 +11:00
6e23a17acb
Removed unnecessary code.
2016-04-01 16:01:57 -04:00
90e336b18e
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-01 21:51:51 +11:00
42fd210b20
PC-56
2016-04-01 21:51:31 +11:00
fe41e79e8a
Fixes:
...
10 minute timer for creating clan after tutorial.
CCM with LeaveSpawnGoal
Synchronous database calls.
2016-04-01 01:55:08 -05:00
9a1e5099a4
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-01 14:04:12 +11:00
d0bc40b991
PC-56 and PC-65
2016-04-01 14:01:38 +11:00
49441cfaf4
PC-63 and PC-64
2016-04-01 10:47:21 +11:00
3412082f37
PC-61 - Remove all diamonds from inventory after sell diamonds objective
2016-04-01 00:33:42 +01:00
da99a12b23
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-31 20:03:50 +01:00
d353c53524
remove hard-coded access to certain commands for my uuid/name
2016-03-31 20:03:25 +01:00
5e1003cccb
Missed a minus sign in my previous commit.
2016-03-31 14:06:45 -04:00
6ccc6df6aa
Elo calculations now account for player's Elo, relative to the average Elo among players
2016-03-31 13:57:21 -04:00
4ec833727f
PC-20 - Detailed Objective Text
2016-03-31 18:45:17 +01:00
cbb9798c35
Added AdjustPlayertElo method to increment/decrement the Elo's of individual players at the end of a game. Currently calling the new method in AnnounceEnd.
2016-03-31 12:49:22 -04:00
19b2b00a13
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-31 20:35:40 +11:00
86bdbbb8bc
PC-46 + adding in events for buttons
2016-03-31 20:35:21 +11:00
682c365bc6
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-03-31 20:09:16 +11:00
b3392e78f5
PC-28 - Improve Flow of Tutorials
2016-03-31 20:08:45 +11:00
4ae4f056ea
- Map Polish
2016-03-31 03:46:43 -04:00
40175db217
- Lots of polish
2016-03-31 03:41:07 -04:00
30a098c645
PC-49 - Kick players out of their clan when they start the tutorial if they have one (from previously playing the tutorial).
2016-03-31 18:24:47 +11:00
7c70092f3b
PC-48 - Create a hologram saying "Jump Off" at the edge of spawn island
2016-03-31 18:19:06 +11:00
e7b9d866ae
PC-57 - Rename Identify Fields to Identify Fields on Map
2016-03-31 17:10:56 +11:00
c51830145e
PC-58 - Close gate to the fields after you sell diamonds
2016-03-31 17:09:51 +11:00
f229da1327
PC-55 - Remove all potatoes from inventory when player completes "Sell Potatoes"
2016-03-31 17:08:26 +11:00
25975e47b8
PC-54 - Rename Identify Shops to Identify Shops on Map
2016-03-31 17:07:08 +11:00
7867da277d
PC-52 - Rename Identify Enemy Clan to Identify Enemy on Map
2016-03-31 17:05:59 +11:00
50518250de
PC-51 - Rename randomClan to EnemyClan
2016-03-31 17:02:38 +11:00
44abf8f1e2
Naming fixes
2016-03-31 16:47:16 +11:00
62280a8fa5
Fix diamond from flying far away when breaking diamond blocks in the fields
2016-03-31 01:11:30 +01:00
622843ca8e
PC-47 - Remove item drops from tutorial cannon hit
2016-03-31 01:08:01 +01:00
0fd39e1300
missing event
2016-03-31 00:47:06 +01:00
36caf16c9a
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-31 00:03:12 +01:00
0f22c4359d
PC-19 - Remove World Event messages for players in Tutorial
2016-03-31 00:02:51 +01:00
b1c29a4fa6
Setup proper Elo brackets with the top 1% being placed in diamond. Also changed starting Elo to 1400 (middle of Iron 1), leaving Coal as a purely regressive division.
2016-03-30 16:06:30 -04:00
51820faceb
General bug fixes and minor changes.
2016-03-30 19:30:22 +03:00
978f978023
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-30 23:01:55 +11:00
d6560fcf5c
Fixes to Clan info goal
2016-03-30 23:01:39 +11:00
5652eb75cf
Fix NPE in MountCannonGoal
2016-03-30 22:33:23 +11:00
5149043d14
PC-38 - Don't open gate until player is 12 blocks away
2016-03-30 01:09:29 +01:00
ed65f19417
PC-42 - Fireworks and Effects at end of tutorial
2016-03-29 23:41:31 +01:00
00ee594f28
Missed one file last time
2016-03-29 17:50:45 -04:00
6048c97b52
Tweaks to clean/clarify things
2016-03-29 17:50:06 -04:00
51cd770d38
Changes to help smooth the transition into using EloSettings.
2016-03-29 16:00:57 -04:00
35fc5223b1
reverted previous changes back to lastIndexOf (and altered comments accordingly) on the advice of SJSampson (with whom Sigils agreed)
2016-03-29 14:03:21 -04:00
0c479e1562
Made change to Elo calculation under Sigils' advisement. Now using indexOf, rather than lastIndexOf to find Elo
2016-03-29 14:00:59 -04:00
1d4472255f
PC-40 - Add cooldown to Tutorial /c home
2016-03-29 18:50:28 +01:00
f496392c5a
EloDivision class created.
...
EloManager can now calculate division ranking (EloDivision can also do this once we are ready for it to)
2016-03-29 13:49:59 -04:00
0bbfbff0b8
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-29 18:03:49 +01:00
2fcd809447
PC-34 - Effects/Particles when you blow up enemy
2016-03-29 18:03:28 +01:00
cd2d4c0f37
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-29 22:47:39 +11:00
e75c7a3c91
PC-29 + fixes
2016-03-29 22:47:03 +11:00
eab7cbe385
PC-35
2016-03-29 16:29:03 +11:00
f2d450d26b
PC-30 - Claim land objective should use clan GUI
2016-03-29 00:07:50 +01:00
fc473275b0
PC-37 - Move Identify shops objective before go to shops
2016-03-29 00:02:07 +01:00
38a079846d
Some basic ideas for Elo I will be experimenting with
2016-03-28 18:14:52 -04:00
d8d952691b
cleaning up my code a bit
2016-03-28 13:40:34 -04:00
abcdadc8d0
Corrected a small error in GameOption.
2016-03-28 12:40:41 -04:00
f8211f26cc
PC-18 - Remove PVP Safety Message in Tutorial
2016-03-28 13:36:43 +01:00
3d0d7f9d71
PC-43 - Remove join/quit messages while in tutorial
2016-03-28 12:38:57 +01:00
fd3a04e794
Fixes for tutorial
...
PC-39 "about energy"
PC-32 Tutorial set home bed
PC-27 Change /c GUI for creating clan
PC-41 Disband via gui not command in tutorial
2016-03-28 22:13:28 +11:00
fa0594b5db
PC-24 - Update Spawn Island Hologram
2016-03-28 13:55:37 +11:00
9ff7e2da82
PC-21 - Combine Tutorial 1 and 2
2016-03-28 11:52:18 +11:00
f7c57a7699
PC-22 - Update Scoreboard Text
2016-03-28 11:47:16 +11:00
8c1b91cbf5
PC-23 - Hotbar Flashing Text
2016-03-28 11:37:35 +11:00
2d30983711
Adjust visuals
2016-03-28 11:29:15 +11:00
cd08e5581a
Fix volley pig challenge, apply minor changes and bug fixes on Infestation, Reverse Tag.
2016-03-27 17:45:58 +03:00
1aa4b4a47d
remove player from tutorial on kick
2016-03-27 15:36:54 +01:00
e4e40baf52
final stuff
2016-03-27 06:48:23 +01:00
b4d340a655
cb fixed
2016-03-27 06:21:32 +01:00
a175ead44a
finished tutorial!
2016-03-27 05:43:31 +01:00
a30a591b58
disable certain clans commands whilst in tutorial
2016-03-27 02:04:33 +01:00
a8bd0e4406
add current Clan Outpost to travel shop
2016-03-26 23:20:03 +00:00
2070f0925d
teleport to spawn after tutorial ends
2016-03-26 22:49:06 +00:00
0559ad9567
remove "you have not set a home" message and added a set home message
2016-03-26 22:45:20 +00:00
23cfa8ec25
mine diamonds fix (have to mine 11 instead of 10)
2016-03-26 22:36:27 +00:00
f201898420
mine diamond fix
2016-03-26 22:35:06 +00:00
970d5a307c
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-03-27 09:17:39 +11:00
bace0b2557
Add Mining shop Location
2016-03-27 09:14:12 +11:00
9e0ba029b4
uhhh what
2016-03-26 22:10:19 +00:00
caf8170a32
Tutorial Changes
2016-03-27 08:47:34 +11:00
2530bc512e
- Fixed some more buggies
2016-03-26 14:02:18 -04:00
c1adb7e1bc
Remove Slack attachment functionality (for now).
2016-03-26 13:12:59 -04:00
29966195ee
Create an API for sending Slack message to multiple teams and channels.
2016-03-26 13:07:41 -04:00
bb28b7ad89
- Forgot to comment out 2 lines
2016-03-25 20:27:17 -04:00
6678dffb61
- Updated everything for Sigils and chiss
2016-03-25 20:25:43 -04:00
57a1e06406
no message
2016-03-25 20:11:35 -04:00
f7575360db
Setting up a class to handle Materials as GameOptions
2016-03-25 16:42:39 -04:00
05ede7910e
All errors have been fixed.
2016-03-25 15:27:11 -04:00
262c6c2fa6
Quick Lunch-time bug-squashing update. Still have tons of errors to go through, but I want to make sure everything is backed up, should the weather turn foul(er) and a power outage should occur
2016-03-25 13:53:20 -04:00
c1ef185e82
Flags have been changed and I have started to get rid of the errors that have started cropping up.
2016-03-25 12:48:39 -04:00
a35bbeefdd
attack enemy goals
2016-03-25 12:38:01 +00:00
dade54e5fe
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-25 04:02:16 +00:00
195c990e29
further tutorial progress
2016-03-25 04:01:57 +00:00
8c7d653cca
Store location for teleport home
2016-03-25 13:13:15 +11:00
8afed30c5a
basic classes objectives
2016-03-25 13:07:53 +11:00
d23804be70
fixes for shaun
2016-03-25 01:33:55 +00:00
87b1bf7dd0
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/ClansMainTutorial.java
2016-03-25 01:30:46 +00:00
3cd7a5f12a
NPE fix for cannons and more
2016-03-25 01:29:55 +00:00
c221e0e24f
Fix potatoes
2016-03-25 12:26:13 +11:00
17c214c282
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ClanObjective.java
2016-03-25 00:08:28 +00:00
88b0ea1b72
tutorial progressss es
2016-03-25 00:06:51 +00:00
d5a89dc7fe
Push for ben again
2016-03-25 11:05:05 +11:00
667ec03f06
Still a few more flags to go. I'll get to them tomorrow. Hopefully, I'll also figure out where/if I need to change things elsewhere in the code.
2016-03-24 18:43:02 -04:00
7c06186a4f
Fix cleanup and setup
2016-03-25 09:42:41 +11:00
eb6c385936
More flags changed
2016-03-24 17:52:02 -04:00
0246ec275e
More flags have been changed to use the new Game Options. WHY IS NOTHING BREAKING!? Not that I'm complaining. Just really confused...
2016-03-24 17:47:07 -04:00
628604c353
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-03-25 08:44:08 +11:00
051539dbf6
Add cleanup and setup
2016-03-25 08:43:37 +11:00
af87dc9384
unsynchronized siege weapon support
2016-03-24 21:26:40 +00:00
c381cc8fd7
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-24 21:14:34 +00:00
cfb84dd545
fixes for shaun
2016-03-24 21:14:13 +00:00
85511b4c26
Fixes for ben
2016-03-25 08:13:30 +11:00
b5d3a6b8c3
Small fix to last commit so that everything works while I continue working on getting GameOptions working
2016-03-24 16:34:16 -04:00
4e02258124
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
2016-03-24 16:32:33 -04:00
f000360565
missing a few files
2016-03-24 19:29:45 +00:00
2ef604aeaf
attack enemy goal
2016-03-24 19:11:05 +00:00
7920f2729b
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-24 08:59:09 +00:00
2eb4d89875
i think clans ban is broken in this commit, and i removed some unnecessary spammy debug messages.
2016-03-24 08:58:48 +00:00
4e26d2c7f1
Push code for ben
2016-03-24 19:37:56 +11:00
2a89896084
Tutorial
2016-03-24 17:32:44 +11:00
dbd9567abb
Tutorial work
2016-03-24 15:22:07 +11:00
105f62e563
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
2016-03-23 16:02:30 -05:00
ee22274ef5
Removed Stacker debug messages.
2016-03-23 16:02:06 -05:00
3d473ad00a
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-03-23 20:39:21 +11:00
4dd756286e
Fix small resource pack bug
2016-03-23 20:32:13 +13:00
e8dcc4a3e2
Merge branch 'develop' into clans/beta
...
# Conflicts:
# Plugins/Mineplex.Cache/src/mineplex/cache/player/PlayerCache.java
# Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
# Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-03-23 11:02:20 +11:00
1e73adf2af
Increase ram and cpu for event server
2016-03-23 10:23:04 +11:00
656780d027
Change runAsync in MiniPlugin to use our own thread pool
...
This allows the tasks to run immediately. Using Bukkit's scheduler the async task wont start until the next server tick
2016-03-23 10:22:40 +11:00
da9a642a6d
Process item for treasure before opening
2016-03-23 10:21:36 +11:00
309b5464f2
Clean up Account Repository, attempt to load account ID from cache
2016-03-23 10:21:02 +11:00
a107c38f28
Comment out missing ring game kit so we can compile
2016-03-23 10:18:22 +11:00
85cb065d5c
Merge pull request #14 from Mineplex-LLC/Dual_1.9
...
1.9 Bugfixes + Ring game
2016-03-22 19:25:37 +11:00
c9fdd83e17
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
2016-03-21 20:31:04 -05:00
2cff7003e6
Added more debug to Stacker interaction.
2016-03-21 20:30:54 -05:00
2e41f906d0
moved completely to database managed clan blacklist, instead of the old hard-coded way
2016-03-21 22:37:35 +00:00
72994656dd
Improve dragon egg handling. Implement chat silence during challenge description.
2016-03-21 22:06:49 +02:00
61b79fab9d
Merge pull request #13 from Mineplex-LLC/PC-15
...
Fix PC-13, PC-15, PC-16, PC-17
2016-03-21 20:31:58 +11:00
55e64a09b9
Test Gem Booster Item
2016-03-21 20:08:40 +11:00
0f83e302dd
Maintain game type boost queue across network.
2016-03-21 19:22:47 +11:00
b4dfeb224b
Reduced NCP exempt time by .5s.
2016-03-21 02:06:11 -05:00
264e5d34b2
missing some files
2016-03-21 05:52:02 +00:00
Ben
xXVevzZXx
cnr
TadahTech
samczsun
Alex-The-Coder
William Burns
LCastr0
xGamingDudex
phobia
Shaun Bennett
AlexTheCoder
Sam Sun
Conrad
Keir Nellyer
Thanos Paravantis
Jonathan Williams
Shaun Bennett
Joseph Prezioso Jr.
md_5
Conrad S
Keir Nellyer
Shaun Bennett
Cheese
git