Thanos Paravantis
87c8c7efa4
Merge branch 'master' into thanos-mineware
2016-05-19 20:42:43 +03:00
Thanos Paravantis
7e40141794
Fix spectators being teleported to map center
2016-05-19 20:40:13 +03:00
cnr
7f44281441
Merge branch 'develop' into project-cosmetics
2016-05-19 10:04:19 -05:00
cnr
18daf45298
Prevent wither assault spectators from reviving teammates.
...
This is a fix in the same vein as PC-103 (c7970d1
2016-05-19 09:51:21 -05:00
Shaun Bennett
012edfed45
Use loaded schematics to display fountain progress
2016-05-18 18:04:21 +10:00
Shaun Bennett
8d7ef7cc9a
Fix UtilBlock setting ghost blocks
2016-05-18 18:03:54 +10:00
LCastr0
11db05b6bf
Fixes spelling of MineStrike gun
...
Fixes spectators not being sent to the
winroom
2016-05-18 03:58:50 -03:00
Shaun Bennett
e3833b95ad
Update Gem Fountain purchase gui
2016-05-18 15:59:04 +10:00
TadahTech
3479d6e318
Fix incognito.
2016-05-17 18:12:05 -05:00
TadahTech
38a0b593ee
Fix height for 1.9 and 1.8 users.
...
*Thanks QA for not fully testing*....
2016-05-17 18:11:28 -05:00
TadahTech
51fd23ff84
Patch Bomber dupe glitch in Bridges in a better fashion.
...
Fix MCL Head Hunter achievement.
2016-05-17 18:11:11 -05:00
Ben
35c7b9a2bd
Incognito Updates:
...
-ADD: Prompt in Tab to identify who is in vanish (Can be a * or [Vanish])
-ADD: Make it so /stats don't work on vanished staff.
-ADD: Make sure it can be toggled off on /vanish again or network leave. Staff get stuck with it when resigning. Should stay on in-between lobbies.
2016-05-17 18:10:07 -05:00
Ben
8a75a5098c
Remove hub invisibility preference for all but Admins and higher.
2016-05-17 18:08:01 -05:00
Ben
014ce137fc
If a player uses /a regardless of if staff are online, offline, or vanished, making it always yield a response telling the player that if there are staff currently online, they will receive a reply soon - removing the "there are no staff online" message. Also a 60s Recharge for this.
2016-05-17 18:03:18 -05:00
Ben
6760c07e6c
Fix staff members getting stuck in both Incognito mode and the Hub Invisibility preference, and not being able to toggle either off them off because Incognito would stop Hub Invisibility from getting toggled (on OR off), and vice versa.
2016-05-17 18:00:20 -05:00
AlexTheCoder
141cafcf28
Implement initial game code and add skeleton for full play
2016-05-17 17:29:23 -04:00
xXVevzZXx
6e9b0e4fa5
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java
2016-05-17 14:41:17 +02:00
cnr
6042be2d2f
Refactor clans ban functionality and remove UtilStreams
2016-05-17 05:57:27 -05:00
cnr
f5cf751622
Revert "Temporarily disable clans ban functionality"
...
This reverts commit b47c49d93b
2016-05-17 05:51:18 -05:00
TadahTech
43cadf564e
Fix Carl the Creeper. Fix Bridges TNT exploit.
2016-05-16 22:03:27 -05:00
samczsun
1fc4239b89
Determine whether Ice Prison target is valid. Fixes PC-281
2016-05-16 15:44:22 -05:00
Alex-The-Coder
1497662b2e
Restrict help display for main Game Command
2016-05-16 03:16:26 -04:00
William Burns
4633b99ad4
Don't block QA from testing, whoops.
2016-05-16 08:07:42 +01:00
LCastr0
fb63b3a1a4
Fixes for winroom command, and illuminated chest
2016-05-15 22:49:10 -03:00
LCastr0
42eef838b3
Fixes podium not being enabled by default
2016-05-15 21:33:36 -03:00
xGamingDudex
a27a618b2f
Made debugging tools only available on test servers
2016-05-16 02:04:15 +02:00
xGamingDudex
816a7ca232
Re-Activated chest buttons
2016-05-16 01:57:58 +02:00
xGamingDudex
d92ad9c53f
Made illuminated chest purchasable and added appropriate lore
2016-05-16 01:51:40 +02:00
LCastr0
511726f72a
Treasure chest coin checker for test servers
2016-05-15 20:43:46 -03:00
xGamingDudex
4ebf48bd45
Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics
2016-05-16 01:34:08 +02:00
xGamingDudex
8ad7646128
Edits to treasure chests
2016-05-16 01:33:54 +02:00
xGamingDudex
f8d5bd3c11
Fixed treasure chests
...
Items would sometimes pop out of chest blocks
You could open illuminated chests before they were converted to real
chests
2016-05-16 00:51:33 +02:00
LCastr0
09b7fbdbbe
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-05-15 18:48:00 -03:00
LCastr0
4f79ec6551
Pinata fixes
2016-05-15 18:47:09 -03:00
xGamingDudex
b4aad690e5
Fixed some rewards and added party trail to chests
2016-05-15 23:31:10 +02:00
xGamingDudex
fdf167953f
Fixed emerald set order
2016-05-15 23:30:17 +02:00
xGamingDudex
ca556f7846
Fixed win room would not sort player properly for solo games
2016-05-15 23:29:58 +02:00
xGamingDudex
7073ba4e6a
Fixed gadgets in the win room
2016-05-15 23:29:24 +02:00
xGamingDudex
1e6dda2d7d
Cleaned up some win effect backend code & fixed kits working in winroom
2016-05-15 23:28:12 +02:00
xGamingDudex
14f7e64a77
Fixed Animator and removed duplicate test call in Game.java
2016-05-15 21:05:37 +02:00
xGamingDudex
d850bed725
Minor code tweaking
...
* Made reward manager ammo multiplier private final field
* Removed old commented code from WinEffectPodium, WinEffectLavaTrap,
ParticleMusic, ParticleEmerald, ParticleBlood
* Cleaned up the GameModifierMineStrikeSkin filter
* Removed unused Math#isBetween(double, double, double) method
* Changed Animator to use PriorityQueue
2016-05-15 19:43:07 +02:00
xGamingDudex
29a0ba565b
Added better hollow calculations to ShapeBox and UtilBlock
2016-05-15 17:05:11 +02:00
xGamingDudex
296f304d29
Changed the way UtilItem.dropItem handles despawning
2016-05-15 17:04:50 +02:00
xGamingDudex
a8db293bcf
Moved JavaDocs from ICosmeticShape (now removed) to CosmeticShape
2016-05-15 17:04:25 +02:00
xGamingDudex
97f82e422d
Merge branch 'project-cosmetics' of
...
ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into
project-cosmetics
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/animation/Animator.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/animation/AnimatorEntity.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ICosmeticShape.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ShapeWings.java
2016-05-15 16:03:36 +02:00
xGamingDudex
aa36097729
Made Animator abstract and added final modifiers
2016-05-15 15:58:05 +02:00
xGamingDudex
22e54557d8
Fixed cleaning method for WineffectRiseOfTheElderGuardian
...
The class contained commented code, removed when debugging
2016-05-15 15:33:42 +02:00
xGamingDudex
abddc446fd
Added java docs and tweaked code
...
* Fixed possible duplication bug in MulitBlockUpdaterAgent
* Tweaked some of the factor methods for Shape.java
* Cleaned some code in ShapeWings.java
2016-05-15 15:32:44 +02:00
xXVevzZXx
44e52f4b5b
Add javadoc to added files
2016-05-15 10:24:29 +02:00
phobia
a67fec95fc
Remove ultra tag
2016-05-15 03:21:58 -05:00
xXVevzZXx
a1a6abc1ca
Add champions gladiators and fix tiny winners typo
2016-05-15 10:13:06 +02:00
LCastr0
1cc44d1b3e
Fixes for the following classes:
...
KitGameModifier
KitModifierType
MultiBlockUpdaterAgent
Shape
GadgetManager
KitModifierType
HatLovestruck
HatSecretPackage
SetLove
Animator
AnimatorEntity
AnimationPoint
ICosmeticShape
UtilText
KitGameModifier
KitModifierType
Removed build.xml and org.eclipse.jdt.ui.prefs
2016-05-15 00:20:07 -03:00
xGamingDudex
24f7a4b409
Added "(Minestrike Weapon Skin)" suffix to MS skins in treasure rewards
2016-05-14 18:53:09 +02:00
samczsun
b2e92fdf15
Don't pass on INTERACT_AT as INTERACT. Fixes PC-114
2016-05-14 09:42:28 -05:00
LCastr0
20b9f428b4
Fixes Illuminated Chest's Lore
...
Fixes Pinata Burst not being saved
Fixes AWP Asiimov and XM1014 Tranquility materials
Removes Fireworks WinRoom
Changes prices of things from 1 shard to Treasure Chest
More unused imports removed
Fixed ANGLE_WING_PATTERN -> ANGEL_WING_PATTERN
Adds javadoc to UtilColor.applyColor()
Adds javadoc to UtilColor.getNextColor()
defaultLeatherColor -> DEFAULT_LEATHER_COLOR
Adds suggestions for UtilColor
Adds final modifier to _worldBorders (UtilPlayer)
Changed _worldBorders key from String to UUID
Adds suggestion for UtilPlayer
Adds final modifier to _type (GameModifierSubPage)
Adds final modifier to _type and _kitType (KitGameModifierPage)
DefaultDencity -> DefaultDensity (Shape)
Changed <Vector> to <> (Shape)
dencity -> density (ShapeBox, ShapeGrid, ShapeSphere)
Using speed and count in constructor (ShapeWings)
Removed empty constructor (WorldGenCleanRoom, MultiBlockUpdaterAgent)
Adds final modifier to all fields (AnimationPoint)
2016-05-14 01:18:37 -03:00
Shaun Bennett
b802cdec6d
Rename shop to "Fountain Keeper"
2016-05-14 14:01:28 +10:00
xXVevzZXx
63c44afa10
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants
2016-05-13 22:05:27 +02:00
xXVevzZXx
df5c628c35
add new gamemodes Tiny Winners, Random Kit SSM, UHC SW, UHC SG and improve OP SG, OP SW, OP Bridges, Dukes of decoration, OP Gladiators, Faster than Light, Bunny Hopper and Countdown
2016-05-13 20:23:04 +02:00
xGamingDudex
0544e86cb1
Started fixing the stat tracking for MS knife
2016-05-13 02:39:43 +02:00
xGamingDudex
2cc609b67e
Moved some rewards from normal to valentines
2016-05-13 01:28:26 +02:00
xGamingDudex
35ab155756
Removed unnecessary lore from minestrike game modifiers
2016-05-13 01:20:06 +02:00
xGamingDudex
d34f77a381
Moved some rewards from normal to winter chest
2016-05-13 01:19:06 +02:00
xGamingDudex
9c2c415eb2
Fixed the emerald trail leaving from idle to moving
2016-05-13 01:14:00 +02:00
xGamingDudex
3bb3821fa9
WinEffect gadget disable and MineStrike name and data update
2016-05-13 01:04:35 +02:00
xGamingDudex
4958ab8149
Bug Fixes
...
* Fixed Menu page adding glow to win effects if game modifiers were
active
* MineStrike skins were not properly applying material and data
* Skinned knife was not dealing damage
2016-05-13 00:38:56 +02:00
xGamingDudex
06e583c05e
Added flat podium to Firework and Punchman
2016-05-12 23:50:41 +02:00
xGamingDudex
956d64d750
Git Merge Import Fix
2016-05-12 23:46:39 +02:00
xGamingDudex
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
xGamingDudex
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
AlexTheCoder
fab24e2139
Allow admins to be opped on testing servers
2016-05-12 17:24:37 -04:00
LCastr0
6f4c6bc545
Fixes counter on WindUp suit
...
Removes kit modifier categories
2016-05-12 15:00:43 -03:00
Sam Sun
2ae072f5b7
Rename modules to correct name
2016-05-12 11:44:35 -04:00
Keir Nellyer
13ff2e5263
Fix query for pulling report profiles
...
Previously we didn't check that the user actually reported an issue so in effect we were creating a report from every single logged incident (regardless of whether the user in question was involved).
2016-05-12 14:38:04 +01:00
Keir Nellyer
814f3516de
Make the chat abuse color easier on the eyes
...
Dark blue [bold] is hard to read, dark aqua [bold] should be easier to read.
2016-05-12 14:22:19 +01:00
Alex-The-Coder
05312a9bef
Update where players spawn upon first join...
...
...to avoid flight kick upon login
2016-05-11 21:57:42 -04:00
xGamingDudex
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
xGamingDudex
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
LCastr0
4fada6de49
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-05-10 12:45:22 -03:00
LCastr0
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
Conrad
8eba2c9ccb
Merge pull request #59 from Mineplex-LLC/feature/logitech-brand
...
Move billboard up 1
2016-05-09 11:55:22 -04:00
AlexTheCoder
7932258579
Move billboard up 1
2016-05-09 03:44:16 -04:00
AlexTheCoder
de1fabf53d
Disable report system as it is not ready to go live
2016-05-09 02:10:51 -04:00
cnr
4aa44cd796
Merge branch 'develop' into clans/beta
2016-05-08 16:53:48 -05:00
Keir Nellyer
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
Conrad
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
AlexTheCoder
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
cnr
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
Keir Nellyer
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
Keir Nellyer
b1a41c3cb3
Make chat abuse colour easier on the eyes
...
Dark blue [bold] is hard to read, dark aqua [bold] should be easier
to read.
2016-05-07 22:48:49 +01:00
xXVevzZXx
d75ba9d4c0
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants
2016-05-07 22:26:15 +02:00
phobia
38f22b1577
Disable obsidian dropping after breaking THE BLOCK
2016-05-07 19:51:19 +10:00
xGamingDudex
5649939f8c
Removed some old disabled code.
2016-05-06 21:59:18 +02:00
xGamingDudex
e04a897488
Added some pre-animation to chicken win effect. Removed some comments.
2016-05-06 21:58:31 +02:00
xGamingDudex
0fea90516b
Alternative emerald trail for full set
2016-05-06 13:24:06 +02:00
xGamingDudex
f58db6ee3b
Removed firework from party death
...
Replaced the death effect with item drops instead
2016-05-06 13:12:28 +02:00
xGamingDudex
d60fea4f76
Added chicken and guardian win room schematic handlers
2016-05-06 13:00:45 +02:00
Shaun Bennett
60dce9ef1b
Change LT, Owner, Developer, Admin to DARK_RED
2016-05-06 13:43:30 +10:00
LCastr0
97ef801e3d
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-05-06 00:40:55 -03:00
LCastr0
49c45628a2
Removed more unused imports
...
Fixed some lores and names for cosmetics
Renamed some classes to match Set name
Commented out the Lovely set (Duplicate of Cupid's Love)
2016-05-06 00:40:22 -03:00
Shaun Bennett
93c2886601
Add boosters to inventory menu
2016-05-06 13:31:59 +10:00
xXVevzZXx
9f2189d173
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
2016-05-06 03:40:00 +02:00
Conrad
55d40a1a6b
Merge pull request #53 from Mineplex-LLC/feature/logitech-brand
...
Changed design of billboard and fixed its centering in hubs
2016-05-05 18:33:15 -04:00
AlexTheCoder
f329051399
Changed design of billboard and fixed its centering in hubs
2016-05-05 18:25:51 -04:00
xGamingDudex
17a4517e71
Merge remote-tracking branch 'origin/develop' into project-cosmetics
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
2016-05-05 21:03:15 +02:00
xGamingDudex
1a96ea3c18
Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics
2016-05-05 20:29:28 +02:00
xGamingDudex
db21c7dd22
EGit FTW!
...
Git, you are the greates, randomly deciding not to include everything
when I spesify you to do so....
This should have been part of prev commit.
2016-05-05 20:26:00 +02:00
xGamingDudex
875fb4eccd
The big bug fix batch
...
+ Added some text utils
+ Added angel wing shape
* Tweaked the wing particle effects.
* Fixed item tool not despawning items in arcade servers
* Removed strange gadget disable
* Updated some death/win effects and particles
* Added Illuminated chest
* Added MS skin name to death message
2016-05-05 20:07:29 +02:00
xGamingDudex
9fca9283e2
Fixed skin layers for Player/Human disguises
2016-05-05 10:39:00 +02:00
Keir Nellyer
e1f2bb9740
Use all-man style braces here to be compliant with the coding standards
...
(cherry picked from commit e553ac5
2016-05-04 16:02:39 +01:00
Keir Nellyer
a663cb3e01
Revert "Revert "Report system (version 1)""
...
This reverts commit d0d2de1e21
2016-05-04 15:24:29 +01:00
Conrad
d7d00e1614
Merge pull request #52 from Mineplex-LLC/alex-mcl
...
Add a method for simply checking if a player has been participating i…
2016-05-04 09:30:00 -04:00
Thanos Paravantis
e7f97fa5b8
Move life related methods to challenge class
2016-05-04 16:21:14 +03:00
Thanos Paravantis
9d53eddabd
Fix lives amount display and remove disguises
2016-05-04 15:40:43 +03:00
Thanos Paravantis
703e957156
Fix volley pig health and knockback message
2016-05-04 15:38:18 +03:00
Thanos Paravantis
2b362ee4f1
Fix egg smash eggs sometimes stay on the map
2016-05-04 15:37:16 +03:00
AlexTheCoder
0e509898ec
Add a method for simply checking if a player has been participating in the current game, and implement it in the ranked bans system
2016-05-03 21:07:50 -04:00
Conrad
145ea9221a
Merge pull request #40 from Mineplex-LLC/clans/beta
...
Clans/beta
2016-05-03 16:57:07 -04:00
LCastr0
cfc6f3703d
Merge pull request #50 from Mineplex-LLC/develop
...
Merge from develop
2016-05-03 13:24:32 -03:00
cnr
57fca2a8d0
Temporarily(?) mitigate spigot CME
...
During a PlayerVelocityEvent in an unloaded chunk (usually as result of
a teleport), if one calls Location#getChunk() on the player's location,
and the chunk contains persistent entities, the server crashes with a
ConcurrentModificationException.
2016-05-03 04:56:31 -05:00
xXVevzZXx
838cc2ce31
fix enchantments and increase arrow amount in gladiators
2016-05-02 23:01:59 +02:00
Conrad
3c482e38cc
Merge pull request #47 from Mineplex-LLC/feature/logitech-brand
...
Convert over to System.out.println() for error messaging and add prot…
2016-05-02 16:34:58 -04:00
Conrad
2cd76fbf72
Merge pull request #48 from Mineplex-LLC/alex-mcl
...
Add catch for rare occurrence where players have no stored data
2016-05-02 16:34:50 -04:00
AlexTheCoder
3d98c08a67
Add in missing file
2016-05-02 16:33:11 -04:00
AlexTheCoder
ccd5b47d75
Convert over to System.out.println() for error messaging and add protection for billboards in Hub via a new manager
2016-05-02 16:20:41 -04:00
xXVevzZXx
8dd89d9dea
fix minor bugs and improve minor things in bridges, sg, uhc, quiver, runner and skywars
2016-05-02 20:27:43 +02:00
Ben
cd2bd8ac1d
Fix the TNT Cannon in the tutorial not exploding correctly when fired at the enemy base's doors, as that would cause the tnt entity to just slightly be out of the wall bound and that made the tutorial think that the player missed the wall, making that part of the tutorial near-impossible to pass unless known where to fire exactly. Along with this I also made the cannon rotation lock to a specific range so that people can't miss. Ever.
2016-05-02 11:49:56 +01:00
Ben
8a1b5572a8
Fix players in tutorial receiving messages from the real game whenever the message sender is not in a clan.
2016-05-02 10:31:45 +01:00
LCastr0
055b8684c2
- Added action bar message when booster is ready (Wind Up Suit)
...
- Moved each suit to an individual package, to make it easier to work with
- Removed some unused imports
- Added util to get entity egg data
- Added kit modifiers: Beastmaster, Horseman and Necromancer (SG), Apple (Bridges)
- Added specific kit pages to game modifier menu
2016-05-02 00:13:06 -03:00
xXVevzZXx
71f8640189
implement Dukes of decoration, OP Gladiators, Countdown, Heroes of the ewe, OP Skywars, Ultra spleef, Assassins and Blood diamonds
2016-05-02 01:06:00 +02:00
Ben
026ab15099
Fix multiple leaving messages being broadcasted to the server when a player is kicked from the server after getting cbanned.
2016-05-01 23:20:55 +01:00
Ben
1e18707fd7
Include the missing PlayerMessageEvent, as I had also forgotten to add documentation about the class.
2016-05-01 23:06:30 +01:00
Ben
480cc0f9be
Fix NullPointerException when a player leaves the server without their Clans Ban client being loaded into memory beforehand.
2016-05-01 23:04:30 +01:00
Ben
e139bea465
Fix kill messages inserting a space below them in chat.
2016-05-01 23:03:18 +01:00
Keir Nellyer
fa017c185d
Add method to load ReportProfile from database
2016-05-01 22:48:02 +01:00
Keir Nellyer
41bc9672ab
Remove un-needed imports
2016-05-01 21:49:08 +01:00
Keir Nellyer
ccf14d0d2a
Declare final variables in ReportCategory
2016-05-01 21:12:01 +01:00
Keir Nellyer
132f431a94
Map each ReportResult to its id in the database
...
We no longer use the statistic system to store the results of reports but rather store the result of each ticket in a database table.
2016-05-01 21:10:55 +01:00
Keir Nellyer
1d36d4c4b9
Map each ReportCategory to it's id in the database
2016-05-01 21:04:20 +01:00
AlexTheCoder
7e97bd346e
Change an internal method to private and add missing class JavaDoc
2016-05-01 15:16:42 -04:00
AlexTheCoder
335c5a4510
Clean up billboard generation and clearing, rewrite MapRender for logos, and add JavaDocs to comply with code standard
2016-05-01 14:58:40 -04:00
xXVevzZXx
6c2caac800
fix some format issues and implement God battles
2016-05-01 19:43:42 +02:00
xXVevzZXx
7bd6cdb93c
Implement Lists and Maps into the variable system and finish more gamemodes
2016-05-01 18:48:07 +02:00
Ben
eae972a3e6
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-05-01 10:11:28 +01:00
Ben
9d97ea8d1e
Missing Clans ban cache class (to do with the commit previously by me)
2016-05-01 10:11:17 +01:00
cnr
4cffb39941
Delay dismount teleport by one tick
...
This mitigates a stack overflow caused by a teleport before a dismount
event processes fully.
2016-05-01 01:30:42 -05:00
AlexTheCoder
48c8a5a630
Force structure to spawn correctly, complete with maps on item frames
2016-05-01 01:56:07 -04:00
Ben
189f9ad524
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-05-01 01:42:32 +01:00
Ben
2337e89a93
Improvements to the Clans ban system in general as it was performing more operations than required, and accessing the database more than was necessary. Polished up the Clans ban GUI as well.
2016-05-01 01:42:11 +01:00
cnr
8ca38b2598
Prepend http:// to resource pack locations
2016-04-30 18:54:17 -05:00
AlexTheCoder
070326e72d
Create systems to automatically create and destroy branding boards, as well as implement the Logitech branding
2016-04-30 19:26:16 -04:00
Keir Nellyer
e553ac5aab
Use all-man style braces here to be compliant with the coding standards
2016-04-30 23:12:25 +01:00
Keir Nellyer
bce218a65e
Merge branch 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-04-30 23:11:35 +01:00
cnr
10166f063b
Merge branch 'develop' into clans/beta
2016-04-30 16:16:57 -05:00
phobia
14204fba5c
Changed resource packs to home hosted ones
2016-04-30 16:02:26 -05:00
phobia
890ab9f67e
Uncommented ClansBanManager's instances
2016-04-30 16:02:26 -05:00
phobia
f1c2e71d56
Some changes to error handlng for clans regions
2016-04-30 16:02:26 -05:00
cnr
634a34dd52
Reintroduce non-Air constraint to cannon explosion
2016-04-30 16:02:26 -05:00
cnr
2eb7b892e0
Refactor cannon explosion effect for clarity
2016-04-30 16:02:26 -05:00
cnr
f2f627116a
Correctly count cannon explosion effect attempts
...
Previously, cannon explosions effects could lock up the main thread if:
- The effect location selection RNG was sufficiently unlucky
- The explosion occured sufficiently deep into a larger claimed
territory
2016-04-30 16:02:26 -05:00
AlexTheCoder
39c105f0cf
Add catch for rare occurrence where players have no stored data
2016-04-30 15:34:04 -04:00
Conrad
d0d2de1e21
Revert "Report system (version 1)"
2016-04-30 14:53:59 -04:00
Conrad
e0e30a8b7f
Merge pull request #43 from Mineplex-LLC/alex-mcl
...
Fix Async Elo Ranked Bans
2016-04-30 14:46:49 -04:00
AlexTheCoder
37a815d52a
Update JavaDocs to fit Mineplex standard
2016-04-30 14:41:28 -04:00
AlexTheCoder
2e4bae6915
Merge branch 'feature/top-elo' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla
2016-04-30 14:14:14 -04:00
AlexTheCoder
2dc5c46624
Fix naming convention on checkRankBannedAsync
2016-04-30 14:13:21 -04:00
AlexTheCoder
41e26f283c
Fix all async elo ranked ban methods and switch to callback system for API hooks
2016-04-30 14:10:09 -04:00
TadahTech
6e35bc0989
Stop spamming the chat.
2016-04-30 00:55:59 -05:00
Keir Nellyer
2490e3df82
Previous git merge cause this single line to be deleted
...
I literally have no idea why or how this happened.
2016-04-29 23:47:01 +01:00
Keir Nellyer
6a00f26d5f
Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
# Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-04-29 23:42:27 +01:00
Keir Nellyer
81cebc4ce7
Swap static helpers for a much better solution
...
This allows for easier refactoring in the future when we move away
from retrieving the CoreClientManager from a static instance.
Mineplex coding standards are also against the use of static helpers
in scenarios such as this, therefore this commit brings this branch
to be in-line with the coding standards.
2016-04-29 23:37:40 +01:00
Thanos Paravantis
89bd325c81
Fix continuous milking sound on milk a cow
2016-04-29 14:35:48 +03:00
Thanos Paravantis
aff5396384
Prevent death effect armor stand modification
2016-04-29 13:41:16 +03:00
Shaun Bennett
184d247fc9
Start adding BoosterPage. Move Boosters to core to support UI's
2016-04-29 17:37:34 +10:00
phobia
f63a872bd4
Changed resource packs to home hosted ones
2016-04-29 14:46:14 +10:00
AlexTheCoder
a8d9745320
- Fixed order of Top Elo
2016-04-29 00:12:25 -04:00
phobia
c814fc73f7
Uncommented ClansBanManager's instances
2016-04-29 12:53:20 +10:00
TadahTech
26f6a1189f
Prettyfy EloCommand
2016-04-28 21:34:43 -05:00
TadahTech
e83e4b270c
Prettyfy EloCommand
2016-04-28 21:34:07 -05:00
TadahTech
00efb7d72e
Fix ELO query
2016-04-28 21:20:48 -05:00
TadahTech
84ca13c0d3
Fix ELO query
2016-04-28 21:09:28 -05:00
TadahTech
80ea7b7a4c
Fix ELO query
2016-04-28 21:09:07 -05:00
TadahTech
5a4f89b484
Fix ELO query
2016-04-28 21:04:07 -05:00
AlexTheCoder
7c279998ec
- Changed top elo queries
2016-04-28 21:55:51 -04:00
AlexTheCoder
8e68d62356
- Added documentation for new EloManager methods
2016-04-28 21:16:18 -04:00
AlexTheCoder
2887630cf8
- Added javadoc headers
2016-04-28 21:11:38 -04:00
AlexTheCoder
4b7684da4c
Merge branch 'feature/top-elo' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla
2016-04-28 21:05:56 -04:00
AlexTheCoder
e032b81842
- Made SQL calls async
2016-04-28 20:59:49 -04:00
TadahTech
562e950361
Remove File headers.
2016-04-28 19:46:13 -05:00
TadahTech
680e579223
Merge Alex's branch into mine.
...
Convert to Java 8
Remove unneeded comments.
2016-04-28 19:39:24 -05:00
TadahTech
168483a9fc
Communities work
2016-04-28 19:30:05 -05:00
TadahTech
725481f310
Top Elo data for Webpage
2016-04-28 19:23:57 -05:00
TadahTech
84c0b1b389
Top Elo data for Webpage
2016-04-28 19:22:45 -05:00
AlexTheCoder
156982460f
- Fixed water permanently [MCL]
...
- Fixed team balancing [MCL]
- Fixed overjoining [MCL]
- Changed bans for quitting ranked matches [MCL]
2016-04-28 20:03:09 -04:00
Keir Nellyer
5dbb3744d1
Improve reputation map initialization logic
2016-04-28 23:52:26 +01:00
Keir Nellyer
c82dd27b64
Make getValueOf method more robust
2016-04-28 23:36:41 +01:00
AlexTheCoder
b105ccb5f1
- Change event priority
2016-04-28 17:48:16 -04:00
AlexTheCoder
b13528ed66
- Further blockage of creating source blocks [MCL]
2016-04-28 17:46:57 -04:00
AlexTheCoder
3f9ef24235
- Removed debug message
2016-04-28 17:44:37 -04:00
William Burns
5d1194192d
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/jobs-site
2016-04-28 18:19:45 +01:00
Thanos Paravantis
8874b52b39
Merge branch 'develop' into thanos-mineware
2016-04-28 19:27:56 +03:00
Thanos Paravantis
6084d04a0f
Commit before pulling from develop
2016-04-28 19:23:21 +03:00
Thanos Paravantis
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
Keir Nellyer
bff5751691
Remove very last @author tag
2016-04-28 14:41:44 +01:00
Thanos Paravantis
3a5ec7dc5d
Continue refactoring and comment main class
2016-04-28 13:11:27 +03:00
Thanos Paravantis
6cc8f854c4
Refactor main game class
2016-04-28 13:02:44 +03:00
Thanos Paravantis
3161cd53e9
Apply new format on floating holograms
2016-04-28 12:31:09 +03:00
AlexTheCoder
dcd376b837
- Improved graphics for Elo display in /stats
2016-04-28 01:01:14 -04:00
AlexTheCoder
189296a586
- Fixed using water in restricted zones in MCL
...
- Implemented Elo in /stats menu
2016-04-28 00:53:04 -04:00
AlexTheCoder
46f873634e
- Decrease time till Overtime in MCL
...
- Block ability to flood in MCL
2016-04-28 00:33:36 -04:00
AlexTheCoder
b4c5be81f3
- Fixed random weather in MCL
...
- Added Elo Division display to /stats for applicable games
- Made fishing rods kept on death in MCL
2016-04-27 23:12:38 -04:00
William Burns
d90e9e7dff
Add a system for allowing all players to use game commands when in the correct mode.
2016-04-27 20:54:52 +01:00
Thanos Paravantis
aff4b6b270
Fix minecart dance double life loss
2016-04-27 22:09:06 +03:00
William Burns
b8d12c0c9d
Small wording changes.
2016-04-27 20:04:36 +01:00
xXVevzZXx
1b5b18c9b2
Prevent exception while adding variables to gamemodes
2016-04-27 17:50:01 +02:00
xXVevzZXx
aa219ec3e5
Implement gamemode feature with modifiable variables and working on first moded games
2016-04-27 17:42:50 +02:00
Thanos Paravantis
ddad17855f
Improve chicken spawning on chicken shooting
2016-04-27 18:37:42 +03:00
Thanos Paravantis
f8ff99fc58
Increase hologram height gain and expire time
2016-04-27 18:37:09 +03:00
Thanos Paravantis
e3a6a0a50a
Fix spawns and map generation on smash off
2016-04-27 18:36:16 +03:00
Thanos Paravantis
c6b1065c4e
Fix scoreboard player team after death
2016-04-27 18:35:39 +03:00
Thanos Paravantis
9407265c73
Display predefined items on diamond hunt
2016-04-27 14:02:43 +03:00
Thanos Paravantis
ba5d06db88
Fix tag master and achievement progress
2016-04-27 13:14:20 +03:00
AlexTheCoder
a16145479e
- Disabled picking up lava
...
- Leaving ranked matches temp bans players from rejoining them
2016-04-27 03:18:44 -04:00
Thanos Paravantis
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
LCastr0
d0e7590b2a
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-04-26 23:23:45 -03:00
LCastr0
a7ef8bec49
Adds new constructor to NotePlayer, to be able to send the song to specific players
...
Some WindUp costume fixes
Added actionbar and song to WindUp suit
Created new booster manager
2016-04-26 23:21:59 -03:00
xGamingDudex
38d03b8468
Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics
2016-04-27 00:03:29 +02:00
xGamingDudex
79f210e242
Schematic and WinEffect update
...
+Added better schematic support
+Fixed schematics not sending block updates to nearby players
+Added win room schematics
*Tweaked some of the win rooms
+Added sounds to the Lava Trap win effect.
2016-04-27 00:01:30 +02:00
Shaun Bennett
41e2ea6490
Fix off by one error in GoalCounter
2016-04-26 16:20:14 +10:00
Shaun Bennett
714000163b
Add messages when fountain is complete and resets
2016-04-26 16:19:27 +10:00
Shaun Bennett
4a8c38e1c8
Add fountain reset command
2016-04-26 15:33:52 +10:00
Shaun Bennett
cabf4c4c8b
Add BlockProgressBar for Gem Fountain
2016-04-26 15:26:07 +10:00
Shaun Bennett
e8370579c0
Counter refactoring
2016-04-26 13:55:06 +10:00
Thanos Paravantis
38769d9616
Add missing tracker classes
2016-04-25 23:01:41 +03:00
Thanos Paravantis
d945bfa17a
Fix array out of bounds on veteran tracker
2016-04-25 23:01:17 +03:00
Thanos Paravantis
d0336be7b7
Add new achievements and modify current ones
2016-04-25 22:59:24 +03:00
Thanos Paravantis
41ef1a757c
Prevent null winner on veteran tracker
2016-04-25 18:03:25 +03:00
Thanos Paravantis
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
Thanos paravantis
a6bf059e6c
Modify challenge names and challenge intro titles
2016-04-25 12:47:55 +03:00
LCastr0
f0cfac8e73
Merge pull request #31 from Mineplex-LLC/develop
...
Merge from develop
2016-04-24 23:15:36 -03:00
LCastr0
28de514d1a
Adds some utils for UtilColor
...
Small changes in Wind Up suit
2016-04-24 21:39:35 -03:00
Thanos paravantis
c214431cbf
Move and rename stat trackers
2016-04-24 22:44:42 +03:00
Thanos paravantis
856eb6059b
Update statistics and implement data tracker
2016-04-24 22:39:56 +03:00
Keir Nellyer
8969ec172b
Merge branch 'feature/report' into feature/report-v2
2016-04-24 18:26:10 +01:00
Keir Nellyer
949f9ca712
Don't allow players to report themselves
...
I left this to last minute to make testing easier, as with this check
in place it means at least two players are required to test the report
mechanism.
2016-04-24 18:10:01 +01:00
Keir Nellyer
96aa5d1c4b
Removed duplicate code
...
Somehow this got duplicated and so therefore was causing compile time
errors, might have been something to do with my git merge.
2016-04-24 17:22:21 +01:00
Keir Nellyer
dab1f9485c
Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
2016-04-24 17:17:17 +01:00
Keir Nellyer
9df4dac023
Remove dead code
...
This was left over from before I took over development of the report
feature.
2016-04-24 17:16:36 +01:00
Keir Nellyer
713263214f
Run ReportPurgeTask asynchronously
...
This prevents the task from hanging the server which may be an issue
when a large amount of reports exist.
2016-04-24 17:15:12 +01:00
Keir Nellyer
57e9cd6e19
Add class headers and remove @author tags
...
This makes the PR compliant with with the Mineplex coding style.
Class headers are used to describe the function of a class and git
history will be used to determine the author of a class.
2016-04-24 17:10:29 +01:00
Keir Nellyer
84f5bd2f31
Handle abusive report types
2016-04-24 16:51:01 +01:00
Thanos paravantis
e2a6500bce
Update game achievements
2016-04-24 13:37:39 +03:00
Shaun Bennett
a0fd852537
Move field to top of class in Game
2016-04-24 13:38:58 +10:00
Shaun Bennett
b21dfad12e
Merge remote-tracking branch 'remotes/origin/develop' into feature/gems
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
2016-04-24 13:37:45 +10:00
Shaun Bennett
c60beec68c
Implement Fountain GUI
2016-04-24 12:40:38 +10:00
LCastr0
491c509317
Added UnlockCosmetics command (/unlockCosmetics <type>)
...
Added Ammo command (/ammo <gadget> <ammo> [player])
Added util for red world border screen (UtilPlayer.sendRedScreen)
Added new costume -> Wind Up
Removed test gadget (ItemBouncyBall)
2016-04-23 22:16:02 -03:00
Thanos paravantis
bfabfab2d1
Fix circle spawn locations
2016-04-24 00:27:39 +03:00
phobia
b21939444c
Some changes to error handlng for clans regions
2016-04-23 16:40:39 +10:00
cnr
c7970d1bd0
Prevent super paintball spectators from reviving teammates. Fixes PC-103
2016-04-22 19:48:03 -05:00
xGamingDudex
ccd630e2ae
Leftovers from merge
2016-04-23 00:56:19 +02:00
xGamingDudex
b7099088a9
Merge remote-tracking branch 'origin/develop' into project-cosmetics
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/block/schematic/Schematic.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguisePlayer.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/data/TNTGenerator.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/MiscManager.java
2016-04-23 00:55:48 +02:00
Thanos paravantis
c526c86813
Add notes to fix recent bugs
2016-04-22 23:26:53 +03:00
Thanos paravantis
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
Jonathan Williams
fe0cee65e8
Added gem and coin rewards back into bonus.
2016-04-22 05:33:25 -05:00
Jonathan Williams
260c617007
Merge remote-tracking branch 'remotes/origin/alex-mcl' into develop
2016-04-22 05:12:30 -05:00
Jonathan Williams
e28621ae26
Set oldElo equal to new elo on new row.
2016-04-22 05:04:13 -05:00
AlexTheCoder
2a4c3209b4
- Enable ELO
2016-04-22 05:44:56 -04:00
AlexTheCoder
70541fd6f2
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla
2016-04-22 05:41:24 -04:00
Jonathan Williams
d73b720323
Merge branch 'features/elo' into develop
2016-04-22 04:34:35 -05:00
Jonathan Williams
477acf044e
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
2016-04-22 04:34:21 -05:00
Jonathan Williams
6db7e648f5
Don't insert new row if the update doesn't succeed because of elo mismatch on loss.
2016-04-22 04:20:59 -05:00
Jonathan Williams
7b18efa7b0
Prevent farming elo up with multiple games by dc and joining new game.
2016-04-22 04:05:07 -05:00
Jonathan Williams
ddd1c5af9b
Removed EloSettings and fixed scoreboard.
2016-04-22 03:10:09 -05:00
Jonathan Williams
34f94c0381
Reverted scoreboard because of MC maxlines turd nugget.
2016-04-22 02:55:27 -05:00
Jonathan Williams
a31eccc15b
Multiply new rating by team size. MIssed that undo!
2016-04-22 02:53:02 -05:00
Jonathan Williams
4577cf0398
Fixed scoreboard :D
2016-04-22 02:47:48 -05:00
Jonathan Williams
7cc4811ede
Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into features/elo
2016-04-22 02:39:35 -05:00
Jonathan Williams
f922be51fe
Scoreboard tweak.
2016-04-22 02:39:08 -05:00
AlexTheCoder
04fe30df43
- Fix sb
2016-04-22 03:38:20 -04:00
AlexTheCoder
5e255fc4ed
Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix
2016-04-22 03:36:21 -04:00
Jonathan Williams
757c945320
Added in kFactor ratio application to rating delta.
2016-04-22 02:35:37 -05:00
AlexTheCoder
03bdc8d2db
Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix
2016-04-22 03:17:54 -04:00
Jonathan Williams
b69a75355c
Fixed scoreboard alignment.
2016-04-22 02:17:40 -05:00
Jonathan Williams
aa6d25139f
Tweaked elo for team games.
2016-04-22 02:04:57 -05:00
AlexTheCoder
b1c05e2ed0
Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix
2016-04-22 02:12:02 -04:00
Jonathan Williams
776093288a
Fixed rating not setting in EloPlayer constructor.
2016-04-22 01:11:48 -05:00
AlexTheCoder
2d2c8858e6
Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix
2016-04-22 02:06:55 -04:00
AlexTheCoder
1d3ad3c5fd
- Enabled ELO for testing
2016-04-22 02:06:37 -04:00
Jonathan Williams
977fbe684a
Fixed elo query.
2016-04-22 01:06:33 -05:00
Jonathan Williams
44d4255628
Added endElo in the appropriate spots.
2016-04-22 00:58:07 -05:00
Jonathan Williams
6d00e8b41f
Refactored Elo to work correctly.
2016-04-22 00:21:11 -05:00
Shaun Bennett
8a5fdccb60
Add to fountain button
2016-04-22 11:26:05 +10:00
AlexTheCoder
d0e3b094c1
- cleaned up and prepped for live update
2016-04-21 20:57:35 -04:00
Shaun Bennett
86df07123c
Merge pull request #28 from Mineplex-LLC/bugfix/admin-command-npe
...
Fix NPE in AdminCommand from IncognitoManager being null
2016-04-22 10:54:20 +10:00
Shaun Bennett
e46798f20e
Fix NPE in AdminCommand from IncognitoManager being null
2016-04-22 10:49:34 +10:00
AlexTheCoder
e55bec505b
- Fix players ending up teleported back to arena due to broken respawn engine
2016-04-21 20:13:39 -04:00
Shaun Bennett
435d3968a2
Fix Fountain string being changed to Counter from refactor
2016-04-21 19:46:20 +10:00
AlexTheCoder
df55d48ab8
- Looks better
2016-04-21 01:03:14 -04:00
AlexTheCoder
d57cc48f0f
- Added new features!
2016-04-20 22:31:54 -04:00
Joseph Prezioso Jr.
f86b18b603
Elo Works Now
...
Ready to move on to MCL implementation
2016-04-20 22:09:18 -04:00
Shaun Bennett
54f0b99756
Add fountain gui command
2016-04-21 11:41:16 +10:00
cnr
2d02d79cec
Fix survival games' Beastmaster wolf spawning
...
Beastmaster wolf spawning suffered from the same issue as the Wizards
"Summon Wolves" spell: spigot has an issue when setting an owner to a
wolf or ocelot without a previous owner. See SpigotUtil for details.
2016-04-20 18:45:54 -05:00
Joseph Prezioso Jr.
2d45ab61cc
Elo re-calculated
...
Elo is now being incremented more consistently (and not multiple times)
2016-04-20 15:48:27 -04:00
Joseph Prezioso Jr.
6a5c8336cf
Elo and Division fixed
...
Elo and Division should be displaying properly
Cleaned the code up a bit
Added endElo() to Game.java to handle team Elo code
Added event listener to check for GameState.End in TDM to call endElo()
2016-04-20 14:52:06 -04:00
AlexTheCoder
588e6f08c2
- Removed TypeWars achievements to make room
2016-04-19 18:07:20 -04:00
Thanos paravantis
6e011b3a89
Add missing SpawnDefinition interface
2016-04-19 21:52:45 +03:00
LCastr0
793f5b3f41
Test gadget added by LCastr0, to get used to the code
2016-04-19 15:20:31 -03:00
LCastr0
2b80ebabf7
Test gadget added by LCastr0, to get used to the code
2016-04-19 15:14:22 -03:00
Thanos paravantis
cb4561c561
Implement team check on challenge selection system
2016-04-19 18:25:36 +03:00
Thanos paravantis
11aef273ba
Fix NPE on Volley Pig
2016-04-19 18:25:04 +03:00
Thanos paravantis
50175f9453
Spawn players with equal distance from ladder on KOTL
2016-04-19 14:27:48 +03:00
Thanos paravantis
17c51f03ad
Remove grass only from used spawns
2016-04-19 14:17:32 +03:00
Thanos paravantis
20fdb1f21c
Restructure methods on Mini OITQ challenge
2016-04-19 13:59:09 +03:00
Thanos paravantis
816abad8de
Fix Mini OITQ barriers enclosing players at spawn
2016-04-19 13:57:39 +03:00
cnr
ef8474ae9d
Set default CustomExplosion maxFallingBlocks to 0
...
This fixes an exception thrown when the trap rune in Wizards is
activated.
2016-04-19 02:59:31 -05:00
cnr
bda9772ba6
Mitigate spigot issue when setting wolf owner
...
This fixes the Summon Wolves spell in Wizards.
Explanation:
- Wolves keep track of their most recent owner.
- When a wolf is assigned a new owner, it updates the data
watcher with the new owner's UUID
- During this process, the old owner's UUID is checked
against the new one
- If the wolf didn't have a previous owner, the old owner's
UUID is the empty string.
- UUID.fromString() is called on the empty string, and throws
an exception.
2016-04-19 02:46:38 -05:00
Thanos paravantis
09fb1842b6
Apply improvements and bug fixes
2016-04-19 10:00:06 +03:00
Shaun Bennett
cb48df6a3d
Update fountain count every 5 seconds. Display Hologram
2016-04-19 14:30:38 +10:00
Shaun Bennett
6dc2559dd1
Merge remote-tracking branch 'remotes/origin/md_5/boosters' into feature/gems
2016-04-19 13:57:33 +10:00
Shaun Bennett
5a667a7d31
Add /fountain command. Fountain implementation
2016-04-19 13:57:19 +10:00
AlexTheCoder
e08965aa25
- Fixed TowerDefender being too difficult to obtain
...
- Fixed wither attacking own towers by accident
2016-04-18 22:58:55 -04:00
AlexTheCoder
6c20427395
- Fixed some bugs and added final achievements
2016-04-18 22:32:15 -04:00
AlexTheCoder
17ac3cb597
- Fix armor checking
...
- Edit wither death message
2016-04-18 20:29:53 -04:00
AlexTheCoder
10aba533f3
- Remove all dependence on UtilShapes
2016-04-18 19:59:55 -04:00
AlexTheCoder
34399db6e8
- Fixed missing GameType
2016-04-18 18:42:56 -04:00
xGamingDudex
d9b6434bad
Typo in description
2016-04-18 23:24:59 +02:00
xGamingDudex
534a5dee4e
Forgot to remove debug message
2016-04-18 22:18:42 +02:00
xGamingDudex
591d3cadc9
Cleaned up some GUI stuff, mostly lores on items
2016-04-18 22:16:10 +02:00
xGamingDudex
e45f800519
Fixed damage calculator error
2016-04-18 20:36:22 +02:00
md_5
9de990744d
Stage
2016-04-18 17:46:38 +10:00
AlexTheCoder
44263beb87
- Make elo store/recover properly
2016-04-17 17:34:18 -04:00
cnr
4227e24ae0
Reintroduce non-Air constraint to cannon explosion
2016-04-17 16:29:23 -05:00
cnr
e375db5aec
Refactor cannon explosion effect for clarity
2016-04-17 13:33:44 -05:00
AlexTheCoder
ee30012011
Merge branch 'feature/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix
2016-04-17 12:27:23 -04:00
AlexTheCoder
d623d0982b
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla-merge
2016-04-17 12:02:08 -04:00
AlexTheCoder
4c35e35fc0
- More polish and bugfixes
2016-04-16 23:59:44 -04:00
Shaun Bennett
4477a215f4
Update to Redis 2.8.1 and clean up repositories ( #26 )
2016-04-16 22:51:20 -05:00
Shaun Bennett
fed9f675d3
Implementation for basic Fountains
2016-04-17 13:51:15 +10:00
Shaun Bennett
9c2cd6a883
Merge branch 'feature/redis-update' into feature/gems
2016-04-17 13:08:11 +10:00
Shaun Bennett
16dacbe3b3
Update to Redis 2.8.1 and clean up repositories
2016-04-17 12:58:44 +10:00
AlexTheCoder
35d7dd8b44
- Fixed stuff
2016-04-16 20:36:19 -04:00
AlexTheCoder
b0d30a4ff4
- cleaned everything up
...
- renamed game
2016-04-16 20:32:14 -04:00
AlexTheCoder
d8f5ac66fc
- More chiss
2016-04-16 14:05:46 -04:00
xGamingDudex
696088b57e
Fixed gun stats between games
2016-04-16 18:16:53 +02:00
cnr
9c6d23f11e
Correctly count cannon explosion effect attempts
...
Previously, cannon explosions effects could lock up the main thread if:
- The effect location selection RNG was sufficiently unlucky
- The explosion occured sufficiently deep into a larger claimed
territory
2016-04-16 07:31:00 -05:00
Thanos paravantis
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
Joseph Prezioso Jr.
bbb81dd663
Elo calls migrated to Game.java
...
Consequently, elo code is actually being called now
Bukkit.broadcastMessage calls have shown where things are breaking
handleElo() added to EloManager to facilitate movement of team elo code
preparing to use EloManager's getNewRatings() method to
calculate team elos
2016-04-15 20:48:56 -04:00
xGamingDudex
ffc0459e5a
Cosmetic Update
...
+ Support for relative copy position from with //copy from worledit in
schematics
+ Better block selection in bounding box in UtilBlock
+ Goal selector utils for entities
+ Global hide and show methods for players
+ Win effects and game modifiers
+ Tweaked player disguises
+ Added clean room generator to arcade games, previously normal flat
world
+ Animation utils
* Edited some particles, hats and death animations
2016-04-16 02:24:41 +02:00
Jonathan Williams
2b2b251548
Merge branch 'clans/beta' into develop
2016-04-15 12:41:14 -05:00
Jonathan Williams
019cfe41cc
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-15 12:40:54 -05:00
Jonathan Williams
609eb562e9
Merge branch 'clans/beta' into develop
2016-04-15 12:40:26 -05:00
Jonathan Williams
a730b81feb
Commented out TournamentManager, moving off develop.
2016-04-15 12:38:25 -05:00
Jonathan Williams
b43953439e
Properly store teamId locally after registering for tournament.
...
Use team id when unregistering for the tournament.
2016-04-15 12:36:28 -05:00
Jonathan Williams
cf3141ddc0
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
2016-04-15 12:30:32 -05:00
cnr
77b6515387
Don't break the repair anvil more than twice
2016-04-15 12:21:25 -05:00
cnr
91d5851628
Don't set a clan's lastOnline time to Timestamp(0)
...
Partially reverts f011fdad5f
2016-04-15 12:21:25 -05:00
AlexTheCoder
09f9ae3b7a
- Update for playability
2016-04-14 23:05:14 -04:00
AlexTheCoder
33b557eb10
- Huuuuuuuge amount of changes for chiss
2016-04-14 22:45:21 -04:00
Joseph Prezioso Jr.
4a4e64a3ff
EloRepository overhaul started
...
Tinkering with EloRepository, using AccountRepository as a base
2016-04-14 20:09:09 -04:00
Jonathan Williams
64d5f91e8f
Remove TeamInvite table.
2016-04-14 18:49:20 -05:00
Ben
0a32eed15d
Fix Cannon TNT firing in the wrong direction and clean up the projectile code, making it more modular.
2016-04-15 00:43:55 +01:00
Joseph Prezioso Jr.
742807d80e
Added generatePlayerElos and updated saveDivision
...
Added method to fill EloManager's playerElos hashmap with values
--This may not work as intended
--Currently only implemented in Team Death Match
2016-04-14 17:17:26 -04:00
Joseph Prezioso Jr.
eb67c12108
Added getRepoElo to EloRepository
...
Added Bukkit.broadcastMessage() calls to test code
Methods that needed to throw SQLExceptions now throw SQLExceptions
2016-04-14 15:21:28 -04:00
Jonathan Williams
3a26225ce2
Finished main tournament calendar UI.
...
Added registration for tournaments.
2016-04-14 12:21:24 -05:00
phobia
29b3f03abf
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-14 21:38:48 +10:00
phobia
cbc6689782
Disable /kill in tutorial and reset food level after hold position
2016-04-14 21:38:37 +10:00
Ben
eab76fefa2
Fix Cannons sometimes glitching out when the owner's clan is deleted.
2016-04-14 12:09:42 +01:00
Ben
3bf3eba005
Completely cancel the explosion falling block for claimed territories.
2016-04-14 12:08:54 +01:00
Ben
a295cade1c
Fix Cannon TNT sometimes breaking blocks in protected regions
2016-04-14 11:35:12 +01:00
cnr
ab21efd2ca
Give the correct amount of old/ancient chests for bonuses
2016-04-13 18:51:52 -05:00
cnr
6b2f601c7a
Prevent a spectator race condition in arcade games
...
Previously, a player would erratically become a spectator if s/he
spammed the "spectate next player" action between rounds (i.e.
left-click while spectating a player).
2016-04-13 18:20:39 -05:00
Joseph Prezioso Jr.
9e8a7b582b
Elo updates
...
EloRanking turned on for Domination, Team Deathmatch, Turf Wars, CTF
Database QoL changes made to EloManager and EloRepository
--Unfortunately, Database still seems to not be updating properly
--Something on my end, or something to do with the queries? Unsure.
2016-04-13 18:35:56 -04:00
cnr
6d01e235fd
Fix online friends list
...
Previously, it was incorrectly asserting that all players were
incognito. If we want to exclude incognito players, we'll have to find a
different way.
2016-04-13 17:24:46 -05:00
Jonathan Williams
85f4ff1299
Starting on Tournaments.
2016-04-13 17:14:48 -05:00
cnr
91c97e38b8
Prevent players from naming their pets "ULTRA"
...
This was being used to fool support into thinking the player had won
Ultra from a chest
2016-04-13 16:37:13 -05:00
William Burns
b54da22dd8
Create a basic site design for potential job applicants.
2016-04-13 21:06:47 +01:00
Ben
7cc0583d8e
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-13 19:52:49 +01:00
Ben
355ab06e6c
Fix the Conquering attribute working for player attacks as well
2016-04-13 13:08:04 +01:00
Ben
a26403f006
Fix Recall & Smokebomb not working regularly
2016-04-13 13:04:43 +01:00
cnr
6428dfd723
Run clan-load callbacks on the main thread
...
This prevents potential CMEs from occurring when a player transfers
his/her clan to another server
2016-04-12 22:54:20 -05:00
Ben
e9d05474f8
Prevent cannons from changing bedrock into charred blocks
2016-04-12 17:14:48 +01:00
Ben
c0ebae4175
Ender chest blocker not actually canceling the opening event.
2016-04-12 17:13:03 +01:00
phobia
11d92c49ec
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-12 09:48:59 +10:00
Ben
eefed175ec
Add the random world event command.
2016-04-11 18:07:11 +01:00
Ben
b313bc5308
Make undead chests not show the 'you are not permitted to use ender chest' messages.
2016-04-10 16:52:54 +01:00
Ben
313b59d1d6
Fix the terrain finder miscalculating the size of undead camps
2016-04-10 16:51:42 +01:00
Ben
e014f4fff9
Fix null pointer in the tutorial when using /tutorial finish
2016-04-10 16:51:12 +01:00
Ben
159a5403ac
Fix rare item duplication bug with Smoke Bomb (was told that it's just like the Recall duplication bug)
2016-04-10 16:47:46 +01:00
Ben
db8ca31567
Fix Meridian Scepter not being perfectly accurate.
2016-04-10 16:16:53 +01:00
Ben
0ac9747df1
Modifying how the Meridian Scepter picks a target, as the previous logic was a bit flawed.
2016-04-10 15:27:20 +01:00
Ben
9a2f4a8936
Fix Meridian Scepter not damaging the victim (would just give the wither effect)
2016-04-10 15:23:43 +01:00
Ben
fe89a5b68e
Fix the Recall rare item duplication bug
2016-04-10 14:50:00 +01:00
Ben
67a36dc7e4
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-10 12:56:30 +01:00
Ben
66274188c8
Add a /we random command to spawn a random world event
2016-04-10 12:56:00 +01:00
Ben
37bb64bffd
Fix Undead Camps from spawning outside of the World Border.
2016-04-10 12:47:56 +01:00
Ben
3ee1f86841
Fix Null Pointers in the ender chest blocker and regular chest blocker for incognito staff.
2016-04-10 12:36:31 +01:00
Ben
8ee2c02dd9
Disable the use of Ender Chests
2016-04-10 11:20:51 +01:00
Ben
e8e73306be
Change the Giant's Broadswords regeneration effect level from 41 to 3
2016-04-10 11:15:43 +01:00
Ben
dd3e009413
Remove silent chest opening mechanism (which was completely broken), and instead don't allow incognito staff to open chests
2016-04-10 10:53:07 +01:00
Conrad S
ccf9d4a4c2
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/repository/SiegeWeaponRepository.java
2016-04-09 13:01:04 -04:00
Thanos paravantis
ea6219984a
Add missing Spleef challenge to removed package
2016-04-09 11:06:46 +03:00
Thanos paravantis
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
Keir Nellyer
eb01cd41f1
Move display item responsibility over to ReportResultButton
...
Previously ReportResultPage handled this.
2016-04-09 00:51:05 +01:00
Keir Nellyer
51b5e50c20
Use pre-existing util method for item building
...
Removes util method added in previous commit.
2016-04-09 00:44:00 +01:00
Ben
4bf19eebad
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-09 00:37:40 +01:00
Ben
92195a12d2
Completely rework Cannon explosions to use the vanilla Minecraft explosions, as those seem to look much more visually appealing, and have less issues.
...
Fixed a loading and saving bug with Cannons, they seem to be a lot more stable now than before.
2016-04-09 00:37:20 +01:00
Keir Nellyer
56b0a886bf
Add helper method for setting common item meta values
2016-04-09 00:36:04 +01:00
Ben
6e9ae04118
Cut Gem to Gold conversion rate down to 16 Gems per Gold, instead of 32
2016-04-09 00:27:24 +01:00
Keir Nellyer
8b6b3db412
Remove old pre-mavenisation files
2016-04-09 00:17:58 +01:00
Keir Nellyer
6efb8d806d
Re-enable category threshold check
...
This was disabled for testing reasons.
2016-04-09 00:02:59 +01:00
Keir Nellyer
cb434b7518
We no longer need to store IDs or notify thresholds (new system will work differently)
2016-04-09 00:00:11 +01:00
Keir Nellyer
bd7e26ef08
Fix error causing enum readable names to fail to generate correctly
2016-04-08 23:49:07 +01:00
Conrad S
05b31725a8
Fix initialization NPE.
2016-04-08 18:48:16 -04:00
Ben
a04f7c23c6
Disable incognito for staff in hub invisibility, and vice-versa
2016-04-08 20:18:56 +01:00
Conrad S
8a2efa2f0b
Make sure a user has enough gold to make a purchase.
2016-04-08 10:48:55 -04:00
Keir Nellyer
95507a740c
Move button specific values from ReportCategory to ReportCategoryButton
...
This is done to separate the code out so that we can add a GLOBAL
value to the enum for handling of ABUSIVE reports (these types of
reports do not have a specific category). In its current state
it's is very closely inter-twined.
2016-04-08 00:33:29 +01:00
Keir Nellyer
c1354081ea
Implement ReportProfile
...
This class is used to hold report-specific data about a user, such as the amount of successful or failed reports the user has filed.
It also contains the total amount of abusive reports a user has filed, all this data will be used to calculate the user's reputation.
2016-04-07 22:45:15 +01:00
Ben
79a2ef3608
Fix staff members getting unhidden when in incognito whenever players are shown to the player (can happen when a regular player toggles player vision, and the staff member gets shown to all other players.)
2016-04-07 22:24:47 +01:00
Joseph Prezioso Jr.
59001bdef6
Fix merge-related errors
...
Fix, polish, and re-implement Elo code.
2016-04-07 16:40:30 -04:00
Ben
2c05743f62
Stop using static with Siege Manager
2016-04-07 21:01:25 +01:00
Keir Nellyer
36e79a1504
Add header to every class as per new coding standards.
2016-04-07 14:44:27 +01:00
Keir Nellyer
390b2878dc
Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-04-07 14:28:30 +01:00
Ben
c484a80a14
Remove incorrect import
2016-04-07 08:12:05 +01:00
Ben
b70ff03185
Fix siege weapon crater being spawned at the lowest block at the current collision location.
...
This was causing issues when Cannons were fired at a vertical wall, and would not do any damage to the wall as it would just do damage to the blocks at the nearest ground block.
2016-04-07 08:11:37 +01:00
Ben
f2ac2d87bf
Remove debug command, that could be very abused
2016-04-07 08:07:18 +01:00
Ben
9ccec50fd0
Remove unnecessary database calls that checked for siege weapons remaining in the database, which is not possible, as siege weapons clean themselves up.
2016-04-07 08:06:16 +01:00
Ben
eed3df720a
Disable incognito mode for staff members that have been demoted whilst using it.
...
Also fixes a bug that caused IncognitoHidePlayerEvent fire even if the player logging in does not have incognito mode enabled.
2016-04-07 07:00:46 +01:00
Ben
3a8ab581dd
Add JavaDoc to new classes to comply with the new standards
2016-04-07 06:52:52 +01:00
Joseph Prezioso Jr
91e550bdcc
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/outpost/Outpost.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/SiegeWeapon.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/command/FinishCommand.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/command/TutorialCommand.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/BlowUpWallGoal.java
2016-04-06 19:40:01 -04:00
Joseph Prezioso Jr
a07e71ba08
GameOption takes a generic value to eliminate the need for more than the one GameOption class.
...
Remove the--now unnecessary--classes that inherited from GameOption.
Consequently, the creation and implementation of GameOptions should be much more efficient.
Note: it may be necessary to add decimal points to doubles and to cast 'long' data types as 'long'.
The above note generally applies to numerical values, but may apply to other values, as well.
2016-04-06 18:10:31 -04:00
Joseph Prezioso Jr
f030f78f08
Add headers to new classes, so as to comply with coding standards.
...
To that end, change methods to camel case and refactor them, so that the newly-renamed methods do not result in errors.
2016-04-06 16:20:26 -04:00
Ben
d75d63a81a
some missing files and blacklist barrier block from block toss
2016-04-06 18:26:56 +01:00
Jonathan Williams
8b42de03cb
Debug messages for PoisonShock
2016-04-06 10:39:00 -05:00
Ben
d25f1abfbf
stop iron door from being opened by players not in clan (outpost)
2016-04-05 23:49:16 +01:00
Ben
738825ea9d
perms for tutoirial command
2016-04-05 23:37:08 +01:00
Ben
4bdd33c87b
blowing holes in the ground and interacting with cannon sometimes not working
2016-04-05 23:15:38 +01:00
Ben
744d8891b4
import
2016-04-05 22:58:03 +01:00
Joseph Prezioso Jr
09db5a8131
I'm committing this so I can checkout to a different branch
2016-04-05 16:41:50 -04:00
Joseph Prezioso Jr
c6c52885a9
Fixed commit
2016-04-05 15:16:40 -04:00
Ben
be63012d18
make trainees+ not count to kicked player count
2016-04-05 12:43:19 +01:00
Ben
876a7a8eb6
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-05 12:37:23 +01:00
Ben
cfac41f216
full server trainee+ fix
2016-04-05 12:37:04 +01:00
Jonathan Williams
dd5b2d5e3f
Fixed NPE with poison condition effect.
2016-04-05 00:36:18 -05:00
Jonathan Williams
e23362bd6f
Fixed NPE in OrderedObjective
2016-04-05 00:36:00 -05:00
Jonathan Williams
b34a175a2b
Fixed error in Outpost throwing NPE.
2016-04-05 00:35:44 -05:00
Shaun Bennett
ae87db1742
Fix TNT generator timings
2016-04-05 13:04:52 +10:00
Shaun Bennett
23232efd63
Merge remote-tracking branch 'remotes/origin/develop' into clans/beta
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
# Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java
2016-04-05 13:04:39 +10:00
phobia
b0dd51843b
Ride horse delay
2016-04-05 10:58:31 +10:00
Ben
7f92a3c048
incognito changes
2016-04-05 00:38:27 +01:00
Jonathan Williams
cd5ad89f51
Made clans sort by server number.
2016-04-04 17:46:51 -05:00
Jonathan Williams
53b25e6ee0
Fixed diamonds not selling in shops.
2016-04-04 17:46:35 -05:00
Jonathan Williams
6558b16004
Fixed endless loop crash bug with Gear attributes.
2016-04-04 17:46:22 -05:00
Jonathan Williams
8ea0051181
Fixed customer support menu not showing if monthly bonus hasn't been claimed.
2016-04-04 17:46:03 -05:00
Jonathan Williams
2d296d9226
Removed debug ResourcePack Message
2016-04-04 17:45:34 -05:00
Jonathan Williams
efa18d394b
Fixed Incognito not saving status.
2016-04-04 17:45:10 -05:00
Jonathan Williams
2fa0787792
Clans now load, added connection property to null zero date timestamps.
2016-04-04 16:31:37 -05:00
Jonathan Williams
2b3e466469
Removed pesky '?' causing login query to stall.
2016-04-04 16:30:57 -05:00
Ben
7de23216f6
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-04 20:41:10 +01:00
Ben
b3b72f1ca0
commenting out clans bans
2016-04-04 20:40:58 +01:00
Jonathan Williams
02459c6a10
Fixed bad implementation of IncognitoManager that was locking up threads.
...
Temporarily disabled MessageManager's handling of Incognito.
2016-04-04 13:48:26 -05:00
Jonathan Williams
60010f90b4
Load simple clan token on player login to reduce overhead.
...
Increased dbpool connections to 4
2016-04-04 13:47:45 -05:00
Jonathan Williams
a91ef68978
Fixed CCM in WarPointEvasion.
...
Removed debug message; NOT RIDER
2016-04-04 13:46:39 -05:00
Jonathan Williams
e2baf2b56c
Updated Clans to use the new ResourcePackManager.setResourcePack method.
2016-04-04 13:46:00 -05:00
Jonathan Williams
1b1e6f6ef5
Moved the redis operation before asking for a mysql connection
2016-04-04 13:45:20 -05:00
Jonathan Williams
781c4bfdbd
Removed db call off main thread for ClanServerPage
2016-04-04 10:31:13 -05:00
Jonathan Williams
91ddac9643
Added world checking for boundary stuff.
2016-04-04 10:30:59 -05:00
Jonathan Williams
e8da5ca0f2
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-04 10:02:01 -05:00
Jonathan Williams
228a001696
Added Shift Left clicking to the ban list for Cannon :D
2016-04-04 10:01:50 -05:00
Shaun Bennett
ff929a8515
Merge remote-tracking branch 'remotes/origin/develop' into clans/beta
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
# Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java
2016-04-05 00:57:28 +10:00
Ben
14207c2073
clansbans
2016-04-04 14:56:20 +01:00
Ben
8330ef560d
not rider spam
2016-04-04 14:55:47 +01:00
Shaun Bennett
fecd3c1eaa
Final changes
2016-04-04 23:28:38 +10:00
Ben
02cb0e1f7e
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java
2016-04-04 13:52:44 +01:00
Ben
1dde17b9cc
shooters still shotting fix
2016-04-04 13:51:05 +01:00
phobia
e85a1e6a3b
fixes to breakingand placing in claim
2016-04-04 22:22:07 +10:00
phobia
4262a4d4b7
Increase radius + delete iron doors after done
2016-04-04 22:07:58 +10:00
phobia
963bba06f7
fix for displaying territorial movements
2016-04-04 17:47:58 +10:00
phobia
2e0c9d3965
Remove potatoe message
2016-04-04 17:34:39 +10:00
phobia
aaccb6fd48
Join/leave/death messages
2016-04-04 17:20:21 +10:00
Shaun Bennett
15c4b2dd58
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-04-04 17:11:15 +10:00
Shaun Bennett
23e116f9b5
Region fixes
2016-04-04 17:10:52 +10:00
phobia
56a087612b
Changes to explain energy goal
2016-04-04 16:58:16 +10:00
Shaun Bennett
be8ed78caa
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-04-04 16:46:17 +10:00
Shaun Bennett
02f774ce94
A lot of bug fixes
2016-04-04 16:45:20 +10:00
Jonathan Williams
85fabd525a
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-04 00:59:25 -05:00
Jonathan Williams
400d2f0cca
Added bonus log view for customer support.
2016-04-04 00:59:13 -05:00
Shaun Bennett
543719b95d
More tutorial fixes
2016-04-04 14:47:33 +10:00
Cheese
040026724b
renamed tutorials
2016-04-04 14:10:26 +10:00
Cheese
29bcd6aeea
more text cahnges
2016-04-04 13:30:15 +10:00
Cheese
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
Cheese
6c92b42335
text changes
2016-04-04 13:01:54 +10:00
Shaun Bennett
29f2442be8
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-04-04 12:53:07 +10:00
Shaun Bennett
8dee8eab0a
Bug fixes
2016-04-04 12:52:52 +10:00
phobia
3173adca53
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-04 12:49:00 +10:00
phobia
5ad877f864
So many fixes <3
2016-04-04 12:47:23 +10:00
Shaun Bennett
0a39b7b756
Fix objective ordering
2016-04-04 12:36:47 +10:00
Shaun Bennett
e11a9379b9
More tutorial tweaking
2016-04-04 12:32:22 +10:00
phobia
5195e4a13d
Message fixes
2016-04-04 10:15:15 +10:00
phobia
c3a119cfe4
Display completion only to player who completes
2016-04-04 10:11:26 +10:00
Ben
a1f284670a
make zombie npcs actually look at the player
2016-04-03 23:49:22 +01:00
Ben
3ff5e6d337
npc fixes
2016-04-03 18:47:31 +01:00
Ben
7558bd01b7
ensure zombies don't burn to death, by losing equipment
2016-04-03 18:29:13 +01:00
Ben
40361acc9b
fixed cannon becoming off-center
2016-04-03 17:51:56 +01:00
Ben
ccdd1f901f
cannon 1.9 fixes
2016-04-03 17:23:55 +01:00
Thanos paravantis
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
Thanos paravantis
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
Thanos paravantis
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
Ben
f4d4b5c5df
siege weapon interaction fix
2016-04-03 14:08:40 +01:00
Ben
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
Ben
c1b659e738
npcs on enemy base
2016-04-03 13:50:11 +01:00
Ben
f5623f00f9
blacklist npe fix
2016-04-03 13:47:57 +01:00
phobia
3ae347653a
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-03 21:33:13 +10:00
phobia
c92d291e96
Shift clicking TNT into the cannon + iron doors fixed
2016-04-03 21:32:56 +10:00
Jonathan Williams
8f58a456b1
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-03 01:37:40 -05:00
Jonathan Williams
401127caa9
Reworked Monthly bonuses so they always succeed and it logs them.
2016-04-03 01:36:30 -05:00
phobia
759911396a
More clans bug fixes + message tweaks
2016-04-03 16:11:47 +10:00
phobia
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
phobia
45cbeef83d
- /c sethome shows the wrong message when the bed can't be placed
2016-04-03 13:32:49 +10:00
phobia
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
phobia
664d8b1a4e
Fixes for clans tutorial
2016-04-03 11:04:57 +10:00
Thanos paravantis
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
Thanos paravantis
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
phobia
b4cfbebf3f
Fix issue with seeling potatoes
2016-04-02 22:53:41 +11:00
phobia
d4e9f638da
Fixed a crash bug with title message being too long + other fixes
2016-04-02 22:26:21 +11:00
phobia
cc09bf6b51
Fixes to Bull Charge + Adding more instructins to purchasing
2016-04-02 21:43:33 +11:00
William Burns
15cf7f574d
Fix join/quit messages.
2016-04-02 11:08:40 +01:00
William Burns
6072753624
Fix shop objective description.
2016-04-02 10:50:46 +01:00
Shaun Bennett
b960925522
Fixes
2016-04-02 20:42:41 +11:00
phobia
5a31be1138
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-02 20:33:09 +11:00
phobia
673dd327ff
Push for shaun Fireworks
2016-04-02 20:29:56 +11:00
Jonathan Williams
e4b2492b35
Fixed ObjectiveGoal's finish from creating CCMs.
2016-04-02 03:03:17 -05:00
Jonathan Williams
ff41ad248a
Removed PvpTimer
...
Fixed issue where StatManager and FriendManager were created twice.
2016-04-02 02:47:17 -05:00
Jonathan Williams
a6710280fb
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-02 00:45:10 -05:00
Jonathan Williams
01d9c1cd09
Finished the <?> for Objective and ObjectiveGoal.
2016-04-02 00:45:01 -05:00
Shaun Bennett
d161d83d12
Maps and other various fixes
2016-04-02 15:43:03 +11:00
Shaun Bennett
5739b1b87b
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-04-02 15:13:16 +11:00
Jonathan Williams
3bc1908b57
Fix player quit staying in _active list for Objectives.
2016-04-01 23:10:15 -05:00
Shaun Bennett
758004f207
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-04-02 14:55:14 +11:00
Jonathan Williams
fa6d18b0fa
Fix sync db call inside sendMessage
2016-04-01 22:43:09 -05:00
Cheese
8f959a73eb
debug
2016-04-02 12:46:25 +11:00
Cheese
9969b7d783
support for resource packs for different MC versions
2016-04-02 11:39:40 +11:00
Shaun Bennett
0abcd0044b
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-04-02 10:53:28 +11:00
Joseph Prezioso Jr
6e23a17acb
Removed unnecessary code.
2016-04-01 16:01:57 -04:00
phobia
90e336b18e
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-01 21:51:51 +11:00
phobia
42fd210b20
PC-56
2016-04-01 21:51:31 +11:00
Jonathan Williams
fe41e79e8a
Fixes:
...
10 minute timer for creating clan after tutorial.
CCM with LeaveSpawnGoal
Synchronous database calls.
2016-04-01 01:55:08 -05:00
phobia
9a1e5099a4
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-01 14:04:12 +11:00
phobia
d0bc40b991
PC-56 and PC-65
2016-04-01 14:01:38 +11:00
Shaun Bennett
49441cfaf4
PC-63 and PC-64
2016-04-01 10:47:21 +11:00
Ben
3412082f37
PC-61 - Remove all diamonds from inventory after sell diamonds objective
2016-04-01 00:33:42 +01:00
Ben
da99a12b23
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-31 20:03:50 +01:00
Ben
d353c53524
remove hard-coded access to certain commands for my uuid/name
2016-03-31 20:03:25 +01:00
Joseph Prezioso Jr
5e1003cccb
Missed a minus sign in my previous commit.
2016-03-31 14:06:45 -04:00
Joseph Prezioso Jr
6ccc6df6aa
Elo calculations now account for player's Elo, relative to the average Elo among players
2016-03-31 13:57:21 -04:00
William Burns
4ec833727f
PC-20 - Detailed Objective Text
2016-03-31 18:45:17 +01:00
Joseph Prezioso Jr
cbb9798c35
Added AdjustPlayertElo method to increment/decrement the Elo's of individual players at the end of a game. Currently calling the new method in AnnounceEnd.
2016-03-31 12:49:22 -04:00
phobia
19b2b00a13
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-31 20:35:40 +11:00
phobia
86bdbbb8bc
PC-46 + adding in events for buttons
2016-03-31 20:35:21 +11:00
Shaun Bennett
682c365bc6
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-03-31 20:09:16 +11:00
Shaun Bennett
b3392e78f5
PC-28 - Improve Flow of Tutorials
2016-03-31 20:08:45 +11:00
AlexTheCoder
4ae4f056ea
- Map Polish
2016-03-31 03:46:43 -04:00
AlexTheCoder
40175db217
- Lots of polish
2016-03-31 03:41:07 -04:00
Shaun Bennett
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
Shaun Bennett
7c70092f3b
PC-48 - Create a hologram saying "Jump Off" at the edge of spawn island
2016-03-31 18:19:06 +11:00
Shaun Bennett
e7b9d866ae
PC-57 - Rename Identify Fields to Identify Fields on Map
2016-03-31 17:10:56 +11:00
Shaun Bennett
c51830145e
PC-58 - Close gate to the fields after you sell diamonds
2016-03-31 17:09:51 +11:00
Shaun Bennett
f229da1327
PC-55 - Remove all potatoes from inventory when player completes "Sell Potatoes"
2016-03-31 17:08:26 +11:00
Shaun Bennett
25975e47b8
PC-54 - Rename Identify Shops to Identify Shops on Map
2016-03-31 17:07:08 +11:00
Shaun Bennett
7867da277d
PC-52 - Rename Identify Enemy Clan to Identify Enemy on Map
2016-03-31 17:05:59 +11:00
Shaun Bennett
50518250de
PC-51 - Rename randomClan to EnemyClan
2016-03-31 17:02:38 +11:00
Shaun Bennett
44abf8f1e2
Naming fixes
2016-03-31 16:47:16 +11:00
Ben
62280a8fa5
Fix diamond from flying far away when breaking diamond blocks in the fields
2016-03-31 01:11:30 +01:00
Ben
622843ca8e
PC-47 - Remove item drops from tutorial cannon hit
2016-03-31 01:08:01 +01:00
Ben
0fd39e1300
missing event
2016-03-31 00:47:06 +01:00
Ben
36caf16c9a
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-31 00:03:12 +01:00
Ben
0f22c4359d
PC-19 - Remove World Event messages for players in Tutorial
2016-03-31 00:02:51 +01:00
Joseph Prezioso Jr
b1c29a4fa6
Setup proper Elo brackets with the top 1% being placed in diamond. Also changed starting Elo to 1400 (middle of Iron 1), leaving Coal as a purely regressive division.
2016-03-30 16:06:30 -04:00
Thanos paravantis
51820faceb
General bug fixes and minor changes.
2016-03-30 19:30:22 +03:00
phobia
978f978023
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-30 23:01:55 +11:00
phobia
d6560fcf5c
Fixes to Clan info goal
2016-03-30 23:01:39 +11:00
Shaun Bennett
5652eb75cf
Fix NPE in MountCannonGoal
2016-03-30 22:33:23 +11:00
William Burns
5149043d14
PC-38 - Don't open gate until player is 12 blocks away
2016-03-30 01:09:29 +01:00
William Burns
ed65f19417
PC-42 - Fireworks and Effects at end of tutorial
2016-03-29 23:41:31 +01:00
Joseph Prezioso Jr
00ee594f28
Missed one file last time
2016-03-29 17:50:45 -04:00
Joseph Prezioso Jr
6048c97b52
Tweaks to clean/clarify things
2016-03-29 17:50:06 -04:00
Joseph Prezioso Jr
51cd770d38
Changes to help smooth the transition into using EloSettings.
2016-03-29 16:00:57 -04:00
Joseph Prezioso Jr
35fc5223b1
reverted previous changes back to lastIndexOf (and altered comments accordingly) on the advice of SJSampson (with whom Sigils agreed)
2016-03-29 14:03:21 -04:00
Joseph Prezioso Jr
0c479e1562
Made change to Elo calculation under Sigils' advisement. Now using indexOf, rather than lastIndexOf to find Elo
2016-03-29 14:00:59 -04:00
William Burns
1d4472255f
PC-40 - Add cooldown to Tutorial /c home
2016-03-29 18:50:28 +01:00
Joseph Prezioso Jr
f496392c5a
EloDivision class created.
...
EloManager can now calculate division ranking (EloDivision can also do this once we are ready for it to)
2016-03-29 13:49:59 -04:00
William Burns
0bbfbff0b8
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-29 18:03:49 +01:00
William Burns
2fcd809447
PC-34 - Effects/Particles when you blow up enemy
2016-03-29 18:03:28 +01:00
phobia
cd2d4c0f37
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-29 22:47:39 +11:00
phobia
e75c7a3c91
PC-29 + fixes
2016-03-29 22:47:03 +11:00
phobia
eab7cbe385
PC-35
2016-03-29 16:29:03 +11:00
William Burns
f2d450d26b
PC-30 - Claim land objective should use clan GUI
2016-03-29 00:07:50 +01:00
William Burns
fc473275b0
PC-37 - Move Identify shops objective before go to shops
2016-03-29 00:02:07 +01:00
Joseph Prezioso Jr
38a079846d
Some basic ideas for Elo I will be experimenting with
2016-03-28 18:14:52 -04:00
Joseph Prezioso Jr
d8d952691b
cleaning up my code a bit
2016-03-28 13:40:34 -04:00
Joseph Prezioso Jr
abcdadc8d0
Corrected a small error in GameOption.
2016-03-28 12:40:41 -04:00
William Burns
f8211f26cc
PC-18 - Remove PVP Safety Message in Tutorial
2016-03-28 13:36:43 +01:00
William Burns
3d0d7f9d71
PC-43 - Remove join/quit messages while in tutorial
2016-03-28 12:38:57 +01:00
phobia
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
Shaun Bennett
fa0594b5db
PC-24 - Update Spawn Island Hologram
2016-03-28 13:55:37 +11:00
Shaun Bennett
9ff7e2da82
PC-21 - Combine Tutorial 1 and 2
2016-03-28 11:52:18 +11:00
Shaun Bennett
f7c57a7699
PC-22 - Update Scoreboard Text
2016-03-28 11:47:16 +11:00
Shaun Bennett
8c1b91cbf5
PC-23 - Hotbar Flashing Text
2016-03-28 11:37:35 +11:00
Shaun Bennett
2d30983711
Adjust visuals
2016-03-28 11:29:15 +11:00
Thanos paravantis
cd08e5581a
Fix volley pig challenge, apply minor changes and bug fixes on Infestation, Reverse Tag.
2016-03-27 17:45:58 +03:00
Ben
1aa4b4a47d
remove player from tutorial on kick
2016-03-27 15:36:54 +01:00
Ben
e4e40baf52
final stuff
2016-03-27 06:48:23 +01:00
Ben
b4d340a655
cb fixed
2016-03-27 06:21:32 +01:00
Ben
a175ead44a
finished tutorial!
2016-03-27 05:43:31 +01:00
Ben
a30a591b58
disable certain clans commands whilst in tutorial
2016-03-27 02:04:33 +01:00
Ben
a8bd0e4406
add current Clan Outpost to travel shop
2016-03-26 23:20:03 +00:00
Ben
2070f0925d
teleport to spawn after tutorial ends
2016-03-26 22:49:06 +00:00
Ben
0559ad9567
remove "you have not set a home" message and added a set home message
2016-03-26 22:45:20 +00:00
Ben
23cfa8ec25
mine diamonds fix (have to mine 11 instead of 10)
2016-03-26 22:36:27 +00:00
Ben
f201898420
mine diamond fix
2016-03-26 22:35:06 +00:00
Shaun Bennett
970d5a307c
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-03-27 09:17:39 +11:00
Shaun Bennett
bace0b2557
Add Mining shop Location
2016-03-27 09:14:12 +11:00
Ben
9e0ba029b4
uhhh what
2016-03-26 22:10:19 +00:00
Shaun Bennett
caf8170a32
Tutorial Changes
2016-03-27 08:47:34 +11:00
AlexTheCoder
2530bc512e
- Fixed some more buggies
2016-03-26 14:02:18 -04:00
William Burns
c1adb7e1bc
Remove Slack attachment functionality (for now).
2016-03-26 13:12:59 -04:00
William Burns
29966195ee
Create an API for sending Slack message to multiple teams and channels.
2016-03-26 13:07:41 -04:00
AlexTheCoder
bb28b7ad89
- Forgot to comment out 2 lines
2016-03-25 20:27:17 -04:00
AlexTheCoder
6678dffb61
- Updated everything for Sigils and chiss
2016-03-25 20:25:43 -04:00
Joseph Prezioso Jr
57a1e06406
no message
2016-03-25 20:11:35 -04:00
Joseph Prezioso Jr
f7575360db
Setting up a class to handle Materials as GameOptions
2016-03-25 16:42:39 -04:00
Joseph Prezioso Jr
05ede7910e
All errors have been fixed.
2016-03-25 15:27:11 -04:00
Joseph Prezioso Jr
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
Joseph Prezioso Jr
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
Ben
a35bbeefdd
attack enemy goals
2016-03-25 12:38:01 +00:00
Ben
dade54e5fe
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-25 04:02:16 +00:00
Ben
195c990e29
further tutorial progress
2016-03-25 04:01:57 +00:00
Shaun Bennett
8c7d653cca
Store location for teleport home
2016-03-25 13:13:15 +11:00
Shaun Bennett
8afed30c5a
basic classes objectives
2016-03-25 13:07:53 +11:00
Ben
d23804be70
fixes for shaun
2016-03-25 01:33:55 +00:00
Ben
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
Ben
3cd7a5f12a
NPE fix for cannons and more
2016-03-25 01:29:55 +00:00
Shaun Bennett
c221e0e24f
Fix potatoes
2016-03-25 12:26:13 +11:00
Ben
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
Ben
88b0ea1b72
tutorial progressss es
2016-03-25 00:06:51 +00:00
Shaun Bennett
d5a89dc7fe
Push for ben again
2016-03-25 11:05:05 +11:00
Joseph Prezioso Jr
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
Shaun Bennett
7c06186a4f
Fix cleanup and setup
2016-03-25 09:42:41 +11:00
Joseph Prezioso Jr
eb6c385936
More flags changed
2016-03-24 17:52:02 -04:00
Joseph Prezioso Jr
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
Shaun Bennett
628604c353
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-03-25 08:44:08 +11:00
Shaun Bennett
051539dbf6
Add cleanup and setup
2016-03-25 08:43:37 +11:00
Ben
af87dc9384
unsynchronized siege weapon support
2016-03-24 21:26:40 +00:00
Ben
c381cc8fd7
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-24 21:14:34 +00:00
Ben
cfb84dd545
fixes for shaun
2016-03-24 21:14:13 +00:00
Shaun Bennett
85511b4c26
Fixes for ben
2016-03-25 08:13:30 +11:00
Joseph Prezioso Jr
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
Joseph Prezioso Jr
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
Ben
f000360565
missing a few files
2016-03-24 19:29:45 +00:00
Ben
2ef604aeaf
attack enemy goal
2016-03-24 19:11:05 +00:00
Ben
7920f2729b
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-24 08:59:09 +00:00
Ben
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
Shaun Bennett
4e26d2c7f1
Push code for ben
2016-03-24 19:37:56 +11:00
Shaun Bennett
2a89896084
Tutorial
2016-03-24 17:32:44 +11:00
Shaun Bennett
dbd9567abb
Tutorial work
2016-03-24 15:22:07 +11:00
Jonathan Williams
105f62e563
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
2016-03-23 16:02:30 -05:00
Jonathan Williams
ee22274ef5
Removed Stacker debug messages.
2016-03-23 16:02:06 -05:00
Shaun Bennett
3d473ad00a
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-03-23 20:39:21 +11:00
git
4dd756286e
Fix small resource pack bug
2016-03-23 20:32:13 +13:00
Shaun Bennett
e8dcc4a3e2
Merge branch 'develop' into clans/beta
...
# Conflicts:
# Plugins/Mineplex.Cache/src/mineplex/cache/player/PlayerCache.java
# Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
# Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-03-23 11:02:20 +11:00
Shaun Bennett
1e73adf2af
Increase ram and cpu for event server
2016-03-23 10:23:04 +11:00
Shaun Bennett
656780d027
Change runAsync in MiniPlugin to use our own thread pool
...
This allows the tasks to run immediately. Using Bukkit's scheduler the async task wont start until the next server tick
2016-03-23 10:22:40 +11:00
Shaun Bennett
da9a642a6d
Process item for treasure before opening
2016-03-23 10:21:36 +11:00
Shaun Bennett
309b5464f2
Clean up Account Repository, attempt to load account ID from cache
2016-03-23 10:21:02 +11:00
Shaun Bennett
a107c38f28
Comment out missing ring game kit so we can compile
2016-03-23 10:18:22 +11:00
Shaun Bennett
85cb065d5c
Merge pull request #14 from Mineplex-LLC/Dual_1.9
...
1.9 Bugfixes + Ring game
2016-03-22 19:25:37 +11:00
Jonathan Williams
c9fdd83e17
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
2016-03-21 20:31:04 -05:00
Jonathan Williams
2cff7003e6
Added more debug to Stacker interaction.
2016-03-21 20:30:54 -05:00
Ben
2e41f906d0
moved completely to database managed clan blacklist, instead of the old hard-coded way
2016-03-21 22:37:35 +00:00
Thanos paravantis
72994656dd
Improve dragon egg handling. Implement chat silence during challenge description.
2016-03-21 22:06:49 +02:00
Shaun Bennett
61b79fab9d
Merge pull request #13 from Mineplex-LLC/PC-15
...
Fix PC-13, PC-15, PC-16, PC-17
2016-03-21 20:31:58 +11:00
md_5
55e64a09b9
Test Gem Booster Item
2016-03-21 20:08:40 +11:00
md_5
0f83e302dd
Maintain game type boost queue across network.
2016-03-21 19:22:47 +11:00
Jonathan Williams
b4dfeb224b
Reduced NCP exempt time by .5s.
2016-03-21 02:06:11 -05:00
Ben
264e5d34b2
missing some files
2016-03-21 05:52:02 +00:00
Jonathan Williams
faf6834e23
Added some protection for stacker and offline players.
2016-03-20 16:27:59 -05:00
Thanos paravantis
644e7a08bb
Bug fixes (detailed description below) and hit box improvements.
...
- Cancel teleport event to prevent the game from breaking.
- Block Lobbers: Fix falling block spawning and item drops.
- Color Change: Fix platform not spawning after first stage.
2016-03-20 23:26:55 +02:00
Jonathan Williams
750b960b46
Fixed references to snake events.
2016-03-20 16:24:11 -05:00
Jonathan Williams
109190ee58
Moved snake events to their own classes.
...
Memory cleanup for Snake.
2016-03-20 15:54:04 -05:00
Jonathan Williams
262f659ffa
Fix with TurfForts infinite while loop.
2016-03-20 15:46:57 -05:00
Thanos paravantis
f57bd37116
Rush push, cloud fall and treasure digger updates/refactoring. Added /mark command to reveal and correct misplaced spawn locations.
2016-03-20 17:20:40 +02:00
Thanos paravantis
8084897782
Rush Push: Update custom damage event listener.
2016-03-20 12:14:09 +02:00
Thanos paravantis
c080bc31ab
Refactor rush push challenge, update win placement.
2016-03-20 11:10:16 +02:00
Jonathan Williams
3bc8dd0098
Fixed bug with infinite loop in Bridges MushroomSpawn.
2016-03-20 00:32:33 -05:00
Ben
723f62b8f9
incognito fixes and loads of other fixes
2016-03-20 01:06:46 +00:00
Jonathan Williams
8427ead097
Changed how currency types is initialized to avoid possible NPE
2016-03-19 15:33:16 -05:00
Thanos paravantis
1a51f51f60
Refactor color change, reverse tag and treasure digger challenge.
2016-03-19 17:36:27 +02:00
Thanos paravantis
115508cf72
Refactor onChallengeUpdate method.
2016-03-19 16:14:56 +02:00
Thanos paravantis
4c8292e7c9
Update color change and reverse tag challenge, changes and improvements and spawnpoints update.
2016-03-19 16:01:42 +02:00
Ben
ef1d6ede24
many fixes
2016-03-19 06:31:37 +00:00
Ben
a21d43e58f
fix NPE
2016-03-19 06:13:39 +00:00
Ben
c4fbae4bd1
added clan name blacklist and changed clans ban GUI
2016-03-19 06:11:32 +00:00
Ben
6172be5d76
few changes
2016-03-19 00:13:31 +00:00
Ben
2e9562fc50
fixed NPE with one of the tutorial goals. fixed silent chest. fixed invsee, updated regions for new map
2016-03-18 22:31:36 +00:00
Thanos paravantis
dd6d128b44
Rename files to match challenge name, change kit description, refactor color change challenge.
2016-03-18 18:36:32 +02:00
Ben
8c7da5e98a
some goals didn't commit
2016-03-18 03:01:42 +00:00
Ben
3ba138a8d7
some more objectives.
2016-03-18 03:01:11 +00:00
Ben
995d454f87
tutorial additions.
2016-03-18 02:47:51 +00:00
Ben
3b764920e1
duplicate messages
2016-03-18 01:22:15 +00:00
Ben
a4cbe54c78
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2016-03-18 01:21:25 +00:00
Ben
2cf59ced8b
new pvp timer management, fixed build house task, fixed incognito
2016-03-18 01:18:35 +00:00
Ben
a3db70ad9c
clear player inventory on tutorial start (and give map)
2016-03-17 09:44:03 +00:00
md_5
4899d56c09
Implement local gem boosters that can be activated on a joined arcade server.
2016-03-17 19:49:05 +11:00
Ben
e6f4375041
build house goal [still broken]
2016-03-17 02:23:05 +00:00
Ben
929981419e
disable item dropping & block breaking
2016-03-17 01:52:36 +00:00
Ben
add651780b
priority chat filters, fixed siege weapon clicking listeners being incorrect
2016-03-17 01:06:07 +00:00
Ben
b164ff0729
Update res pack
2016-03-16 23:56:39 +00:00
Ben
1c1ed1613a
allow kill command while in void/after other damage methods
2016-03-16 23:56:30 +00:00
Ben
d625b20ea8
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
2016-03-16 22:48:04 +00:00
Ben
93767b7a90
tutorial changes, chat filter system, commented out all web stuff for analytics.
2016-03-16 22:46:18 +00:00
Ben
2c9021fb81
some chat formatting
2016-03-16 22:31:35 +00:00
Joseph Prezioso Jr
7cf49dbe3b
Refactored code to correct errors from previous commit
2016-03-15 20:46:30 -04:00
Joseph Prezioso Jr
5fdd3e0872
Updated North, South, East, and West Spawns and Centers
2016-03-15 20:12:09 -04:00
Ben
0d237370e1
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-15 23:33:09 +00:00
Ben
7589c63904
analytics progress
2016-03-15 23:32:56 +00:00
Ben
8897f2e86e
fixed NPE
2016-03-15 23:11:08 +00:00
Ben
4638ba909d
siege weapon finalizations & analytics (wip)
2016-03-15 22:52:13 +00:00
Keir Nellyer
25075597f2
Only allow Ultra+ players to use /report whilst it's in beta testing.
2016-03-15 17:43:16 +00:00
Shaun Bennett
4e85a315f9
Objectives!
2016-03-15 11:50:35 -05:00
Shaun Bennett
e53b8616d1
A ton of tutorial work
2016-03-15 10:29:43 -05:00
Ben
d7de4381a3
add 200ms damage delay to cannon damages. and add temporary damage holograms
2016-03-15 00:49:37 +00:00
Ben
813a3833ae
implement temporary holograms
2016-03-15 00:48:50 +00:00
Ben
13bbcc51dc
remove cannon pickup feature
2016-03-15 00:23:59 +00:00
Ben
3ae89e12a8
improve cannon UI
2016-03-15 00:21:37 +00:00
Ben
c556d7b3c3
fix ConcurrentModificationException
2016-03-15 00:21:15 +00:00
Ben
864b12adbf
make cannons explode chest items
2016-03-15 00:20:40 +00:00
Ben
e08ba29ac1
Final fixing of cannon saving/loading
2016-03-14 22:48:31 +00:00
AlexTheCoder
3212b75e4e
- Finally finished all of chiss' changes
2016-03-12 09:35:44 -05:00
Thanos paravantis
2f96325f0c
Challenge refactoring.
2016-03-12 11:16:37 +02:00
Ben
422df69335
incognito async stuff and updated alpha holograms
2016-03-11 21:50:48 +00:00
Ben
bdfb55d4e1
nevermind [revert leap change]
2016-03-11 21:22:01 +00:00
Ben
bfdb7add2e
run siege weapon queries async
2016-03-11 21:04:22 +00:00
Ben
1008c58e91
removed catapult code as it's very out of date at this point (and it's not being used hehe)
2016-03-11 19:33:02 +00:00
Ben
eb0da6552c
add C.cBlue to name of Outposts & Cannons.
2016-03-11 19:31:24 +00:00
Ben
523c194c56
Fix data values not being correct in shop page.
2016-03-11 19:31:05 +00:00
Ben
d1c7879224
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-11 19:08:40 +00:00
Ben
45a0853564
remove test classes
2016-03-11 19:07:11 +00:00
Ben
86c50cc3cd
updates
2016-03-11 19:03:32 +00:00
Shaun Bennett
1228ca227e
Add support for 1.9 resource packs, Text Tutorials
2016-03-11 11:50:08 -06:00
Ben
2aa68d3e16
final stuff and map
2016-03-11 04:14:16 +00:00
Ben
a27fb90c2a
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
2016-03-11 02:21:03 +00:00
Ben
0e276474c5
fixerroooniissssss
2016-03-11 02:20:18 +00:00
Ben
01ba099d74
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
2016-03-11 01:52:38 +00:00
Ben
c9eb2c9559
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
2016-03-11 01:52:31 +00:00
Ben
57c65cf5ff
some changes and vanish fixes maybe?
2016-03-11 01:47:14 +00:00
Ben
8ce32fcdfa
little tweakers
2016-03-11 00:58:47 +00:00
Ben
a568db6d90
remove eclipse file
2016-03-11 00:43:30 +00:00
Ben
bcfe4a42c0
changerooonis
2016-03-11 00:41:28 +00:00
Ben
33d978c6d6
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-10 22:12:41 +00:00
Ben
20ade492a8
tnt generator changes
2016-03-10 22:09:45 +00:00
Shaun Bennett
76782fd420
Fix issues
2016-03-10 15:07:22 -06:00
Ben
c2f6217d9f
allowed sr. mods to use /we (TEMP)
2016-03-10 17:38:16 +00:00
Ben
0fd0a7fb44
mak esupply drop beacons more specific
2016-03-10 17:38:03 +00:00
git
557b0bf978
Fix Wither disguise
2016-03-11 01:55:49 +13:00
Ben
2d2e88e069
some fixes and updates
2016-03-10 02:47:48 +00:00
Ben
9b40496a1e
siege weapon picking up
2016-03-09 23:56:25 +00:00
Joseph Prezioso Jr
4955abb519
Hopefully, ELO Rating will be grabbed from the correct column now...
2016-03-09 17:12:04 -05:00
Ben
1532abcc62
disable nether and legendary fixes
2016-03-09 21:12:02 +00:00
Ben
70aa5d63fd
touched up on some messages
2016-03-09 13:10:39 +00:00
Ben
51e5552e2d
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-09 11:56:25 +00:00
Ben
cf6645cec7
Legendaries and other preparation for beta
2016-03-09 11:55:40 +00:00
phobia
e3fb40805c
all siege items shouldn't be able to be placed or used while on PvP timer.
...
Fixes to Jagged prefix
2016-03-09 22:46:45 +11:00
Virizion
67e844db29
Added /e bridge <seconds> PC-17
2016-03-08 21:21:53 -05:00
Ben
5b3da3d06f
Consistency. (Changed Vanish to Incognito)
2016-03-09 01:53:01 +00:00
Virizion
6c0d18662f
Added /e clear <player or @a> PC-16
2016-03-08 20:45:23 -05:00
Ben
befb27d3db
Finalized Vanish system
2016-03-09 01:45:17 +00:00
Virizion
c89669aec9
Add /e announce <text> PC-15
2016-03-08 20:23:33 -05:00
Virizion
b1c8158e2f
Added @a argument to /shard, /gem and /giveitem PC-13
2016-03-08 19:52:31 -05:00
Joseph Prezioso Jr
059b964f22
eloRating now after warLosses so that it matches better with the SQL table
2016-03-08 17:06:13 -05:00
Joseph Prezioso Jr
19375e5720
callEvent now has a return type
2016-03-08 16:20:53 -05:00
Joseph Prezioso Jr
ac91ba690c
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-08 16:08:14 -05:00
Joseph Prezioso Jr
b8f06374cd
Made changes to accommodate for Clan ELO's
2016-03-08 16:07:52 -05:00
Ben
abdf61de0a
*more fixes*
2016-03-08 21:02:25 +00:00
Ben
af8f0fff16
vanish error fixes
2016-03-08 21:00:19 +00:00
Ben
69091c079f
Merge branch 'feature/incognito' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-08 20:58:11 +00:00
Shaun Bennett
9b65926d42
Fix rank monthly rewards description
2016-03-08 13:26:26 -06:00
Joseph Prezioso Jr
97f5b60404
Merge github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-03-08 13:56:05 -05:00
Ben
1f09616784
chat packet listener
2016-03-08 18:28:54 +00:00
Shaun Bennett
99c2fefed2
Merge remote-tracking branch 'remotes/origin/clans/tutorial' into clans/beta
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2016-03-08 12:27:45 -06:00
Shaun Bennett
3283b873e7
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
2016-03-08 12:19:28 -06:00
Ben
26b7ea2d59
fixes
2016-03-08 18:19:12 +00:00
Shaun Bennett
876a568bd0
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/repository/OutpostRepository.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/repository/SiegeWeaponRepository.java
2016-03-08 12:17:07 -06:00
Shaun Bennett
ffd9d98d2e
Merge remote-tracking branch 'remotes/origin/clans/tutorial' into clans/beta
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2016-03-08 12:15:47 -06:00
Shaun Bennett
e39b3de237
Fix errors
2016-03-08 12:12:44 -06:00
Ben
86ef10456c
packet hnadler beginning, switching to clans to fix errors
2016-03-08 18:10:57 +00:00
Shaun Bennett
890a3f4bc9
Merge develop into clans/beta
2016-03-08 12:09:04 -06:00
Ben
f24e196efd
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
2016-03-08 18:07:57 +00:00
Ben
6b61d4aecd
Disable Alpha Manager.
2016-03-08 18:03:07 +00:00
Ben
036565abb7
more
2016-03-08 17:44:15 +00:00
Ben
0ff434cf91
progress
2016-03-08 16:49:32 +00:00
git
0f752fb7e3
Fix custom names in 1.9
2016-03-08 16:11:12 +13:00
Ben
d86ef81056
weaps oops
2016-03-08 01:11:16 +00:00
Ben
263e3e7768
forgot to push
2016-03-08 01:07:35 +00:00
Ben
9953388b92
iunvseeeeeeeeeeee
2016-03-08 00:32:36 +00:00
Ben
48cfe4d91c
fixed & inv see?
2016-03-08 00:27:06 +00:00
git
280d03daa7
Fix names
2016-03-08 09:52:30 +13:00
Thanos paravantis
1ee7a42b9c
Challenge refactoring, modify challenge ending and chat messages, add generateGrass helper method.
2016-03-07 18:32:33 +02:00
git
496983ee04
Untested bugfixes
2016-03-07 22:29:14 +13:00
NewGarbo
ae42aaaab1
Sammy changes + cleanup
2016-03-07 03:25:22 +00:00
NewGarbo
7e2086df1c
flash fix, rares update, and outpost fixes
2016-03-06 19:55:58 +00:00
Thanos paravantis
4e6ba4ebd1
Challenge refactoring.
2016-03-06 16:45:25 +02:00
NewGarbo
ae2da31544
Merge branch 'clans/alpha' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2016-03-05 23:14:32 +00:00
NewGarbo
8cfbe20a08
re-added delay to /spawn
2016-03-05 23:09:57 +00:00
Thanos paravantis
c2d5699aa8
Challenge refactoring, bug fixes, add additional helper methods.
2016-03-06 00:59:13 +02:00
NewGarbo
d92f817efc
fixed some teleportation bugs and a bit of cleanup
2016-03-05 22:50:06 +00:00
NewGarbo
e88736c1aa
changes to scepter, NPE fix
2016-03-05 20:46:24 +00:00
Thanos paravantis
0f58c1378c
Challenge refactoring.
2016-03-05 17:51:30 +02:00
Thanos paravantis
c30f6b0f96
Main class and challenge refactoring.
2016-03-05 17:06:07 +02:00
NewGarbo
d79107eaaa
new legendary weapons and nether finzlizations
2016-03-05 03:07:25 +00:00
Shaun Bennett
d108679d43
Fix compile error
2016-03-04 14:09:20 -06:00
Thanos paravantis
51d4db5e46
Implement game settings and challenge list. Add isChallengeValid and isPlayerValid for event checks.
2016-03-04 20:01:08 +02:00
NewGarbo
7b9ff288f3
nether progresssisiannsnsssss
2016-03-03 23:23:20 +00:00
git
6d0ca4f813
Merge branch 'Dual_1.9' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
2016-03-03 13:49:31 +13:00
git
0ffa67dfb8
Ring game
2016-03-03 13:48:22 +13:00
Thanos paravantis
9e09d8c477
Challenge refactoring.
2016-03-02 22:54:47 +02:00
Keir Nellyer
b18f2d8682
Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
2016-03-02 20:02:09 +00:00
NewGarbo
73d8870daf
nether work (forgot to commit days ago oops)
2016-03-02 19:42:53 +00:00
Shaun Bennett
3447354814
Dual 1.9 Fixes
2016-03-02 12:58:30 -06:00
Thanos paravantis
9a4f4dbd7c
Merge branch 'master' into thanos-mineware
2016-03-02 18:47:30 +02:00
Thanos paravantis
60dfce4612
Challenge refactoring, move challenges to new package.
2016-03-02 18:45:27 +02:00
Shaun Bennett
a3b7a3269c
Merge branch 'develop' into Dual_1.9
2016-03-01 15:14:59 -06:00
Thanos paravantis
cb8b180c2f
Start challenge refactoring, implement helper methods.
2016-03-01 18:50:41 +02:00
Thanos paravantis
77871e3195
Implement challenge settings and data.
2016-03-01 17:09:43 +02:00
Thanos paravantis
6570adc4af
Improve zombie on infestation challenge.
2016-02-29 22:40:09 +02:00
Thanos paravantis
dd538dedd5
Fix Lava Run challenge map generation.
2016-02-29 20:19:26 +02:00
Thanos paravantis
6a2f66f722
Challenge bug fixes and refactoring.
2016-02-29 15:07:33 +02:00
Thanos paravantis
2bc396dc17
General bug fixes and improvements, add map height preference.
2016-02-28 18:15:37 +02:00
git
0284fed2a9
Update patch
2016-02-28 13:12:59 +13:00
Keir Nellyer
ffc678cc3d
Small tidy-up of code.
2016-02-27 00:25:48 +00:00
Keir Nellyer
bafd34f9ac
Add "Show All" link.
2016-02-27 00:08:48 +00:00
Keir Nellyer
c9b343a1fb
Pro-tip: Always make sure you read Trello before adding a feature (un-doing pagination).
2016-02-26 22:55:33 +00:00
Thanos paravantis
bcb489f13d
Map support and parse locations. Minor changes and bug fixes.
2016-02-27 00:13:02 +02:00
Thanos paravantis
1e08e1a5db
Update player death handling, add aggressive chicken behavior, minor changes and refactoring.
2016-02-26 18:17:03 +02:00
Shaun Bennett
775b6eeffa
Merge pull request #7 from Mineplex-LLC/feature/dmt-update
...
Draw My Thing Update
2016-02-26 04:38:10 -06:00
Shaun Bennett
923e51483c
Remove fill line
2016-02-26 04:29:27 -06:00
Shaun Bennett
4472c52432
Fix bucket
2016-02-26 04:21:26 -06:00
William Burns
268536ce68
push 4 shaun
2016-02-26 08:13:28 +00:00
Thanos paravantis
0e697e279b
Player death handling and chicken attack changes.
2016-02-25 23:35:38 +02:00
William Burns
e4ba5d9723
Fix colour targeting FINALLY!
2016-02-25 19:48:15 +00:00
Keir Nellyer
af8ad218be
Separate previous, pages and next buttons.
2016-02-25 18:29:38 +00:00
Keir Nellyer
1c7d48575f
Initial pagination draft.
2016-02-25 18:18:35 +00:00
William Burns
dead7a0850
Use a different method for targeting blocks.
2016-02-25 16:09:00 +00:00
William Burns
9a8c410448
Fix lore being null.
2016-02-25 15:39:18 +00:00
William Burns
009d48659b
Add commands for naming items.
2016-02-25 15:29:47 +00:00
William Burns
a97409b64a
Adjust max distance for targeting.
2016-02-25 15:04:19 +00:00
William Burns
7f6517a823
Ignore barrier blocks when drawing.
2016-02-25 14:23:16 +00:00
git
fcc3e8e024
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9
2016-02-25 18:15:12 +13:00
git
2a9d49ccd9
Merge branch 'master' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9
2016-02-25 18:11:12 +13:00
William Burns
19b6c3d95f
Make sure the blocks are in the canvas.
2016-02-24 21:37:22 +00:00
William Burns
a5060e014b
Replace old paint bucket recursive filling.
2016-02-24 21:34:41 +00:00
Thanos paravantis
1dbf7581d2
Add missing game class.
2016-02-24 21:45:38 +02:00
Thanos paravantis
27daace524
Rename game type to Bawk Bawk Battles, change item display to Egg.
2016-02-24 21:43:10 +02:00
Thanos paravantis
f2d58bd55c
Player death handling and chicken attack update, working version.
2016-02-24 20:13:23 +02:00
Thanos paravantis
a7fb1df539
Experimenting with player death and chicken attack.
2016-02-24 18:10:57 +02:00
William Burns
35a853a198
Remove redo/undo system as per request of @mightysigils.
2016-02-24 08:17:13 +00:00
William Burns
33bf3e2e6e
Merge branches 'develop' and 'feature/dmt-update' of github.com:Mineplex-LLC/Minecraft-PC into feature/dmt-update
2016-02-24 08:03:42 +00:00
William Burns
700f5ec44a
Add Redo/Undo system (WIP).
2016-02-24 07:58:50 +00:00
NewGarbo
d524645ddd
placed the clan name hologram thingy correctly because it's inside the outpost!!!
2016-02-23 19:11:29 +00:00
NewGarbo
d65bf965c4
fix only some blocks of outpost being reset and explosion particles not showing up
2016-02-23 18:51:34 +00:00
NewGarbo
2956b18821
some hologram work
2016-02-23 18:45:04 +00:00
NewGarbo
879a211a41
change siege weapon damage indicator display length
2016-02-23 17:00:14 +00:00
Thanos paravantis
6a234aa50f
Chicken attack and death handling progress.
2016-02-23 18:56:49 +02:00
NewGarbo
deb22fd4e7
add 'time till despawn' hologram on outposts and the owner clan of the outpopsts above doors
2016-02-23 16:54:07 +00:00
NewGarbo
205e3885b8
disallow players on pvp timer to use bows
2016-02-23 16:14:56 +00:00
NewGarbo
41e140d5ca
stop players from placing water in outposts
2016-02-23 16:07:12 +00:00
NewGarbo
bcd4480f23
stop recruits from opening trapped chests
2016-02-23 15:57:12 +00:00
NewGarbo
306e56980c
remove weapon teleport fix
2016-02-23 14:44:07 +00:00
NewGarbo
de4568d448
accurate-ish weapon damage tracking
2016-02-23 13:03:50 +00:00
Thanos paravantis
f1cb8378ac
Test commit
2016-02-23 14:54:12 +02:00
Keir Nellyer
70260754ff
Reset these files to their previous state (IDE added tabs).
2016-02-23 00:26:10 +00:00
Keir Nellyer
c923745f5f
Add required import.
2016-02-23 00:25:37 +00:00
NewGarbo
f0fc2fd519
progress [testing github]
2016-02-22 20:44:00 +00:00
Keir Nellyer
99150db2d7
Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/report/ReportRepository.java
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
2016-02-22 19:02:54 +00:00
NewGarbo
76cf65c267
siege system changes
2016-02-22 09:34:04 +00:00
NewGarbo
db7382d01e
testing github?
2016-02-21 01:34:13 +00:00
xGamingDudex
33b3d121b3
Merge branch 'develop' into project-cosmetics
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatLovestruck.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatSecretPackage.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCoalFumes.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleEnchant.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleFrostLord.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleGreen.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleHeart.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleHelix.java
2016-02-20 15:30:26 +01:00
AlexTheCoder
65be5fcd99
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla
2016-02-20 03:30:57 -05:00
AlexTheCoder
3b7a7e457c
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2016-02-20 03:20:27 -05:00
AlexTheCoder
0a6cdfa779
- chiss' requested changes
2016-02-20 03:18:59 -05:00
Shaun Bennett
3a73b05895
Fix for ServerMonitor not loading database config
2016-02-20 00:48:30 -06:00
Shaun Bennett
82d51a896f
Add SERVER_STATS to DBPool. Rename STATS to MINEPLEX_STATS
2016-02-19 19:54:06 -06:00
Shaun Bennett
8d7453b78e
Merge remote-tracking branch 'origin/develop' into develop
2016-02-19 19:33:52 -06:00
Shaun Bennett
7032568a92
Add PLAYER_STATS DBPool
2016-02-19 19:33:39 -06:00
md_5
a84f8dd2d0
Fix dbcp, tone down sentry
2016-02-19 20:28:22 +11:00
md_5
81f9ca0bc2
Fix mysql
2016-02-19 20:10:01 +11:00
Shaun Bennett
6e2eea50bb
Merge remote-tracking branch 'origin/develop' into develop
2016-02-19 02:46:25 -06:00
md_5
d575266522
Fix sentry
2016-02-19 19:44:36 +11:00
Shaun Bennett
3b10207503
Class.forName!
2016-02-19 02:40:14 -06:00
Shaun Bennett
d3d22bbec9
Merge pull request #168 in MIN/mineplex from clans/alpha to develop
...
* commit '67c355bf652e9c802dc1e8e56b088c44cdaaac3b': (21 commits)
remove more eclipse files
remove eclipse files
moar undead fixes
Fixes to observer settings
Clans Alpha 1.0 changes
WP Evade
More alphs bug fixes
Fixes to flame and broadsword
Clans alpha bug fixes
Fixed /c stuck timer taking 7 seconds instead of 2 minutes
Fixes to TntProtection
Added safe zone protection for flame
finalized alpha patches
alpha fixes
raised war points for invasion to 25
Fixes to war point evasion
Added fix to WarPoint evasion bug + 1 dmg bug
that's not needed
MAVEN TEST COMMIT
Fixed issues with Broadsword Added max building height of 100
...
2016-02-19 01:30:09 -06:00
NewGarbo
67c355bf65
remove more eclipse files
2016-02-19 07:22:54 +00:00
NewGarbo
441cf702c7
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-02-19 07:22:09 +00:00
md_5
c811906a7e
REVERT: Provide option to load config from mineplex.yml, not per game folders. (reverted from commit b58ea5b51a)
2016-02-19 18:21:01 +11:00
NewGarbo
d5583b93f2
remove eclipse files
2016-02-19 07:14:13 +00:00
Shaun Bennett
7714e4960c
Use DBPool for everything
2016-02-19 00:17:38 -06:00
Shaun Bennett
eab992e621
Delete SimpleStats
2016-02-18 23:01:23 -06:00
md_5
6d81e43b30
Don't print db config to System.out
2016-02-19 15:30:30 +11:00
md_5
b58ea5b51a
Provide option to load config from mineplex.yml, not per game folders.
2016-02-19 15:25:09 +11:00
NewGarbo
dc5fe21f3d
more npe checking
2016-02-18 21:53:55 +00:00
NewGarbo
24b834370b
null pointers with siege weaponl oading
2016-02-18 21:37:13 +00:00
NewGarbo
8507bb1bd8
all progress over this week
2016-02-18 21:29:42 +00:00
Thanos paravantis
6d05c54a7a
Commit before pulling from master.
2016-02-18 21:30:12 +02:00
libraryaddict
8b1b63c8b3
Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into Dual_1.9
...
Conflicts:
Patches/craftbukkit.jar
2016-02-18 16:45:37 +13:00
AlexTheCoder
d3884bd090
- Spawn regen
2016-02-17 22:12:23 -05:00
AlexTheCoder
fe849576f7
- Spawn protection
2016-02-17 22:04:20 -05:00
AlexTheCoder
4158c12227
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2016-02-17 21:44:51 -05:00
md_5
1a1c64dc51
Fix PerkMadScientist on non game zombies.
2016-02-17 18:44:49 +11:00
md_5
b5f4055269
Fix command stack trace on unitialized arcade games.
2016-02-17 18:40:24 +11:00
md_5
3fad9c639a
Fix stack trace in master builders when clicking on a watch.
2016-02-17 18:39:26 +11:00
md_5
50f58ba3a5
Don't stack entities when a game isn't running.
2016-02-17 18:33:40 +11:00
md_5
628e77a701
Don't process empty chat messages.
2016-02-17 18:32:43 +11:00
md_5
e6c00b06ee
Fix exception in GameChatManager if an Arcade game has not been initialized.
2016-02-17 18:29:47 +11:00
md_5
e3861d3bc0
Fix NPE in TnTGenerator
2016-02-17 18:22:37 +11:00
AlexTheCoder
9e2840b3b5
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2016-02-16 21:28:07 -05:00
AlexTheCoder
efb63ee824
- fixes
2016-02-16 21:27:50 -05:00
Shaun Bennett
c20e32d2c0
Merge remote-tracking branch 'origin/develop' into develop
2016-02-16 16:55:11 -06:00
Shaun Bennett
684a40db41
Fix giving TITAN in Staff Server
2016-02-16 16:55:00 -06:00
Shaun Bennett
1c5ae77329
Fix Valentines quick server menu button
2016-02-16 16:54:05 -06:00
xGamingDudex
35b9e01aff
Added FlySpeed Cap to WitherAssault game
2016-02-16 19:26:00 +01:00
xGamingDudex
d10dc3d7be
Fixed NPE in KillsWhileEvolvingTracker for game Evolution
2016-02-16 19:22:18 +01:00
xGamingDudex
9c1e574f6a
Fixed ConcurrentModificationException in PerkDeadlyBones:99
2016-02-16 19:09:06 +01:00
xGamingDudex
2f302f4892
Fixed NPE for Gladiators death event
2016-02-16 18:54:13 +01:00
xGamingDudex
2436b7084a
Fixed some chat issues, especial one at GameChatManager:125
2016-02-16 18:52:18 +01:00
xGamingDudex
10e89a228e
Added some extra checks to Blood
...
Should resolve possible NPE and Material.AIR issues along
2016-02-16 18:48:27 +01:00
xGamingDudex
2d5868657a
Fixed NPE in PerkVanish
2016-02-16 18:35:42 +01:00
xGamingDudex
2d3956175b
Should have fixed PerkFishFlurry Block NPE on update (132)
2016-02-16 18:32:17 +01:00
xGamingDudex
ad6c506361
Concurrency Exception in PerkDeathsGrasp fix
2016-02-16 18:18:47 +01:00
xGamingDudex
d33905e174
Fixed NPE in MiscManager regarding hub clock tp fix for Master Builders
2016-02-16 18:09:07 +01:00
xGamingDudex
f551703d9c
SkyWars TNTGenerator NPE fix
2016-02-16 17:57:00 +01:00
xGamingDudex
7645af8933
Should have fixed falling block explosions sometimes throwing exceptions
2016-02-16 17:41:16 +01:00
AlexTheCoder
16c03ebb48
- Silly skeletons! Swimming is for players!
2016-02-15 21:54:18 -05:00
md_5
8893db60d7
Fix highly annoying exception in Reindeer mount.
2016-02-16 12:46:39 +11:00
Shaun Bennett
37757ad7de
Add TypeWars to MPS
2016-02-15 18:55:13 -06:00
AlexTheCoder
53ac1827bc
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2016-02-15 19:13:20 -05:00
AlexTheCoder
8d1b270089
- Balancing and bugs
2016-02-15 19:12:25 -05:00
Shaun Bennett
904798ec22
Delete libraries directory/old craftbukkit jar (now in Patches folder)
2016-02-15 18:10:44 -06:00
Shaun Bennett
95c22a59fd
Use DNS for chat filter
2016-02-15 16:30:57 -06:00
Shaun Bennett
d1e098ca13
Merge remote-tracking branch 'origin/develop' into develop
2016-02-15 20:44:52 -06:00
Shaun Bennett
15ed2570e2
Valentines final changes, Change Gift Giver achievement
2016-02-15 20:43:46 -06:00
xGamingDudex
85b8937801
Hats, supposed to go in the previous one
2016-02-15 16:39:04 +01:00
xGamingDudex
7d8ffa1311
Small stuff
2016-02-15 16:38:18 +01:00
NewGarbo
a5de88e6ee
accidentally added those ifles
2016-02-15 11:25:33 +00:00
NewGarbo
e25accfba4
outpost saving and loadi9ng
2016-02-15 11:24:29 +00:00
md_5
305973198c
Merge remote-tracking branch 'origin/md_5/sentry' into develop
2016-02-15 09:20:34 +11:00
AlexTheCoder
f0d59755d2
- Update
2016-02-14 03:31:36 -05:00
phobia
d7ad2cdc58
moar undead fixes
2016-02-14 12:37:37 +11:00
NewGarbo
93a5ca6777
weapons need to be centered
2016-02-14 00:45:54 +00:00
phobia
24254635a8
Fixes to observer settings
2016-02-14 09:51:59 +11:00
AlexTheCoder
f6c38903f2
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2016-02-13 14:34:11 -05:00
AlexTheCoder
6385aacbac
- Updates
2016-02-13 14:28:39 -05:00
AlexTheCoder
138c900484
- Fixed up for more universal damage switching
2016-02-13 12:46:57 -05:00
AlexTheCoder
8b39d7ba43
- Void damage fix
2016-02-12 23:16:56 -05:00
AlexTheCoder
ea893bfa48
- Fixed update
2016-02-12 23:03:38 -05:00
AlexTheCoder
197bcc9dbf
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java
2016-02-12 21:23:58 -05:00
AlexTheCoder
9595a0ffae
- Lot of stuff
2016-02-12 21:22:00 -05:00
NewGarbo
e6eb43ada8
PUSHING CODE BECAUSE MY HDD MIGHT BE BREAKING DOWN. THIS CODE IS UNTESTED PROBABLY DOESN'T WORK
2016-02-12 19:58:40 +00:00
Shaun Bennett
0d19a8017f
Update Featured arcade game, various bug fixes
2016-02-12 06:51:30 -06:00
Shaun Bennett
e8559d423a
Add Valentines Vendetta to quick server menu
2016-02-12 05:27:50 -06:00
Shaun Bennett
960a0cdabb
Fix constructor error, add ValentinesGiftManager to Arcade
2016-02-12 05:06:13 -06:00
Shaun Bennett
eca400278c
Support server update
2016-02-12 05:00:09 -06:00
Shaun Bennett
1e596a6969
Valentines rewards
2016-02-12 04:54:09 -06:00
Shaun Bennett
66aa89b5e0
Fix sheep look bug, valentines gift effects, valentines achievements
2016-02-12 04:32:26 -06:00
Shaun Bennett
dfd61833b7
Valentines changes
2016-02-12 03:03:47 -06:00
Shaun Bennett
4f0f81c8df
Update Courtship messages
2016-02-12 01:47:20 -06:00
Shaun Bennett
d51e26a5a4
Valentines game adjustments
2016-02-12 01:34:29 -06:00
NewGarbo
90570c1185
progress on saving outposts/wepaons so far. not finished. probably going to change it to a different format
2016-02-12 07:00:21 +00:00
Shaun Bennett
d8965179f7
More valentines adjustments/fix gladiators tutorial being enabled
2016-02-11 23:01:59 -06:00
Shaun Bennett
2eeddb828b
Merge pull request #165 in MIN/mineplex from virizion_speed_builder to develop
...
* commit '51d152d48473f820ab6d03586fb41f890750f645':
Perfect build all fix
Only eliminated players are guardians. Broken blocks/mobs go directly into inventory.
Stop mid game joiners from getting participation gems.
Mob egg baby fix. Also fixed non build entities from being "broken"
spec command add guardian
The infamous look direction bounce bug
Chiss' double jump mechanic
Moar fixes
Hopper item pickup fix.
2016-02-11 22:59:35 -06:00
William Burns
790ed4f993
Fix tools for block type/colour selections.
2016-02-11 08:11:40 +00:00
NewGarbo
67b12f3ae2
loads of progress
2016-02-10 19:24:57 +00:00
William Burns
b3045d38e7
Add colour selection for multiple block types.
2016-02-10 16:34:00 +00:00
NewGarbo
b308d1759f
renamed stuff to more sensible stuff. :}
2016-02-10 13:02:55 +00:00
NewGarbo
2be917e623
give enemy info about time before siege and after outpost is built, the health of the outpost
2016-02-10 13:01:31 +00:00
NewGarbo
69bdbdde70
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2016-02-10 11:54:36 +00:00
NewGarbo
35f0162882
make catapults rideableeeeeee
2016-02-10 11:09:17 +00:00
Cheese
eebe25040e
cleaned the particle effects a bit
2016-02-10 16:31:25 +11:00
Shaun Bennett
00f7880dd2
Fix compile error
2016-02-09 21:15:15 -06:00
Shaun Bennett
e3ff25526b
Merge pull request #164 in MIN/mineplex from valentines/game to develop
...
* commit '6800e4ef478e2d1eea5c19ec52a8368ec0bd520a':
valentines final push
bug fixes
more valentines :)
many valentine, such wow
val1
2016-02-09 20:28:58 -06:00
Shaun Bennett
f6e091f029
Merge pull request #163 in MIN/mineplex from feature/valentines-cosmetics to develop
...
* commit '57638ff68496b6f10012f8782633066b52a8a715':
More work on valentines
Valentines gifts
Added love potion and hub sheep thing.
Started on Love Potion system. Switching branches.
Varius tweaks and changes.
Added sheep mount to index.
Added various cosmetic items for Valentines day.
2016-02-09 20:28:37 -06:00
Shaun Bennett
57638ff684
More work on valentines
2016-02-09 16:26:17 -06:00
NewGarbo
43cf4d38ef
give player arrow back after failed territory siege declaration arrow thingy fire thingy ehh grammar is not needed at night :}
2016-02-09 21:36:58 +00:00
NewGarbo
e74cefeee8
increased siege weapon placement area, and made outposts handle siege weapons that are placed within them
2016-02-09 19:59:01 +00:00
NewGarbo
e782097563
shouldn't be able to fire weapons whilst in siege wait time
2016-02-09 19:49:25 +00:00
NewGarbo
2b44b88ea2
not being able to fire bow without the correct class and changed arrow to actually be an arrow
2016-02-09 19:48:48 +00:00
NewGarbo
67d1bffe82
npe and clan minimum players set for siege
2016-02-09 19:47:42 +00:00
NewGarbo
9342bee371
das ist gut
2016-02-09 17:05:59 +00:00
Cheese
6800e4ef47
valentines final push
2016-02-09 20:43:24 +11:00
NewGarbo
99ece6eaea
add chest with arrwos to outpost. test for clans in area
2016-02-09 05:53:37 +00:00
Shaun Bennett
a868b8b2b8
Valentines gifts
2016-02-08 22:26:33 -06:00
NewGarbo
dd2fe36a3d
added "Borderlands" to Clan name blacklist
2016-02-08 22:23:26 +00:00
NewGarbo
052d3c3380
siege system updates
2016-02-08 21:33:12 +00:00
NewGarbo
2c13824f9b
possesive method in UtilText
2016-02-08 20:46:45 +00:00
NewGarbo
b8471d7a8e
getter for crater size
2016-02-08 20:46:15 +00:00
NewGarbo
3ee3059bc7
against clan needs to have a getter
2016-02-08 18:38:30 +00:00
NewGarbo
9379c4190a
add against clan to outpsots and also renamed "clan" to "owner" to make it more obvious
2016-02-08 18:31:03 +00:00
Virizion
51d152d484
Perfect build all fix
2016-02-07 19:05:53 -05:00
xGamingDudex
c4da8ef636
Cosmetic Update
...
+ Set Storm
+ Set Shadow
+ Set Music
+ Set Emerald
+ Set Blood
+ Set Enchant
+ Particle Ying and Yang
+ Particle Wings Angel
+ Particle Wings Infernal
+ Particle Wings Pixie
+ Shape Utils
* Particle Party Time
* Particle Heart
* Double Jump Firecracker
2016-02-08 00:21:47 +01:00
Virizion
aaf1fd42f3
Only eliminated players are guardians. Broken blocks/mobs go directly into inventory.
2016-02-07 18:16:36 -05:00
Virizion
b40f018ee2
Stop mid game joiners from getting participation gems.
2016-02-07 17:20:58 -05:00
Virizion
e96b4c4a7f
Mob egg baby fix. Also fixed non build entities from being "broken"
2016-02-07 15:59:59 -05:00
Virizion
008fc587b0
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2016-02-07 15:33:37 -05:00
Virizion
7e9ff95ae3
spec command add guardian
2016-02-07 15:27:39 -05:00
Shaun Bennett
a5c5a7c536
Merge pull request #157 in MIN/mineplex from bugfix/bridges-ore-mining to develop
...
* commit '465f12e210120e316e9252dc4e5b7207b4ae0279':
Fixed NPE
Made sure that a valid tool is used before dropping any items.
2016-02-07 14:00:46 -06:00
Shaun Bennett
c059425e9d
Remove GiveawayManager (not used anymore)
2016-02-07 13:18:29 -06:00
Mysticate
465f12e210
Fixed NPE
2016-02-07 13:27:38 -05:00
Shaun Bennett
f502c2a693
Fix filtermessage sync calls
2016-02-07 12:15:08 -06:00
Mysticate
a8ff714ee4
Added love potion and hub sheep thing.
2016-02-07 10:19:40 -05:00
md_5
f7b8dada6d
Add Sentry to BungeeCord too.
2016-02-07 21:40:51 +11:00
Cheese
2ab1b51401
bug fixes
2016-02-07 14:09:02 +11:00
Cheese
a35a9ea31f
more valentines :)
2016-02-07 13:27:53 +11:00
Mysticate
c1393697f8
Started on Love Potion system. Switching branches.
2016-02-06 14:08:17 -05:00
Shaun Bennett
4f5625d63e
Clans Alpha 1.0 changes
2016-02-05 18:42:22 -05:00
phobia
27e4ef784c
WP Evade
2016-02-06 08:44:37 +11:00
NewGarbo
9dc34b5a60
better damage calculation and fixed messages for siege weapon damaging
2016-02-05 19:12:12 +00:00
phobia
b0888208d1
More alphs bug fixes
2016-02-05 23:55:38 +11:00
NewGarbo
e448046e4f
made inv get cleared on fire
2016-02-05 10:40:53 +00:00
Virizion
2ac7840d71
The infamous look direction bounce bug
2016-02-04 23:54:54 -05:00
Virizion
b0b43524da
Chiss' double jump mechanic
2016-02-04 22:05:46 -05:00
Mysticate
b414642990
Varius tweaks and changes.
2016-02-04 21:58:55 -05:00
Virizion
a76e570b8a
Moar fixes
2016-02-04 21:43:17 -05:00
Cheese
690c2acce8
many valentine, such wow
2016-02-05 13:25:57 +11:00
NewGarbo
bef898afc1
final fixes (? (still broken))
2016-02-05 01:01:10 +00:00
phobia
6291decf87
Fixes to flame and broadsword
2016-02-05 11:42:39 +11:00
NewGarbo
1b92871b93
remove annoying debug messages
2016-02-04 23:50:44 +00:00
NewGarbo
62d45d5419
fix flip starngesness
2016-02-04 23:49:02 +00:00
NewGarbo
f5d826a2cb
two parentheses. all it took to fix it. GRRR
2016-02-04 23:42:27 +00:00
NewGarbo
8c1ae12d19
beta stuff
2016-02-04 23:29:48 +00:00
phobia
73d4ff2639
Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha
2016-02-05 10:12:31 +11:00
phobia
6fd9cffb01
Clans alpha bug fixes
2016-02-05 10:12:18 +11:00
NewGarbo
16012285e0
rotation fix
2016-02-04 23:11:51 +00:00
NewGarbo
6c7d08a8f9
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-02-04 22:55:53 +00:00
NewGarbo
e61b36f55c
Fixed /c stuck timer taking 7 seconds instead of 2 minutes
2016-02-04 22:55:37 +00:00
NewGarbo
03da4485b3
pushing to switch to clans/alpha
2016-02-04 22:54:43 +00:00
NewGarbo
bc19cf01f7
hopefully that fixes the location offset =/
2016-02-04 22:48:11 +00:00
NewGarbo
fa460dbd45
catapult rotatyyyy
2016-02-04 21:50:47 +00:00
Mysticate
e94222a68e
Added sheep mount to index.
2016-02-04 13:13:22 -05:00
Mysticate
c0d6cbbb85
Added various cosmetic items for Valentines day.
...
- Heart arrow trail
- Heart death animation
- Heart double jump animation
- Heart set
- Cupid's bow gadget
- Pink Sheep mount
2016-02-04 13:12:53 -05:00
NewGarbo
50c2da2a95
forgot to include this; version getter thingy in Clans
2016-02-04 16:10:14 +00:00
NewGarbo
5a8fae4974
stop catapult projectile from getting stuck on bounding box
2016-02-04 16:09:32 +00:00
NewGarbo
ecdd21a800
version or plugin command now shows version of clans
2016-02-04 16:09:13 +00:00
NewGarbo
b13494f399
more modifications to siege weapons.
2016-02-04 16:00:41 +00:00
Cheese
5c22c841fe
val1
2016-02-04 10:55:29 +11:00
Shaun Bennett
699a26f630
Merge pull request #159 in MIN/mineplex from master to feature/dmt-update
...
* commit '70d41b074f9256b4ac0b6fb51b68fb24dcf10e24': (328 commits)
Fix treasure stair orientation
add a shard queue to DonationManager, use that for TreasureShardReward
mac fix
Commons codec is not included in BungeeCord.
Pooling with later jedis versions doesn't work on Bungee.
Gitignore redundant Eclipse files.
Add Eclipse magic.
Fixed various ways of players going invisible through Spec mode.
Speed up LobbyBalancer to 500ms
Add example maven settings.xml
Remove setTestOnBorrow
Tone down lobby balancer too.
Emergency patch to slow down redis player count updates.
Fixed explosions dropping right items.
sapling fix
Update fixes - @Teddy!
Made block define its own drops.
Removed an nunnecesarry method
Fixed items not dropping their regular counterpart.
Final changes
...
2016-02-03 16:06:59 -06:00
Mysticate
af5cf309ca
Made sure that a valid tool is used before dropping any items.
2016-02-03 14:43:14 -05:00
NewGarbo
c17849b751
fixed some autoboxing stuff
2016-02-03 17:30:07 +00:00
Keir Nellyer
27fc81dd8b
Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
2016-02-03 17:23:40 +00:00
NewGarbo
4e2da061bb
added protection around siege weapon
2016-02-03 17:07:06 +00:00
NewGarbo
4488b73e93
change catapult bounding box to 3
2016-02-03 17:02:31 +00:00
NewGarbo
0cb557d922
moved some stuff around and slight changes
2016-02-03 17:02:06 +00:00
NewGarbo
38cae1e3a2
catapult implemented using new siege weapon system, cannons polished up. not tested completely. don't expect this code to work fully haaha
2016-02-03 15:28:53 +00:00
NewGarbo
6bba486385
Added message if cannon is not loaded correctly
2016-02-03 11:20:11 +00:00
NewGarbo
d4388870c1
fixed inventory opening on mount
2016-02-03 11:19:33 +00:00
NewGarbo
8004d0dc3c
fixed npes
2016-02-03 11:06:58 +00:00
NewGarbo
95741e3029
fixed siege weapon base
2016-02-03 10:53:53 +00:00
phobia
5fd089c768
Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha
2016-02-03 17:43:43 +11:00
phobia
f011fdad5f
Fixes to TntProtection
2016-02-03 15:10:56 +11:00
phobia
0e0582a1a7
Added safe zone protection for flame
2016-02-03 10:39:21 +11:00
Keir Nellyer
a8f9c91534
ReportServer: update package name and configure Maven to generate a META-INF file with the main class name included.
2016-02-02 22:28:18 +00:00
NewGarbo
9086188280
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2016-02-02 22:02:06 +00:00
NewGarbo
6fea76a8e4
finalized alpha patches
2016-02-02 21:38:38 +00:00
NewGarbo
23883148dd
alpha fixes
2016-02-02 20:55:23 +00:00
NewGarbo
cfbfb1fa3b
raised war points for invasion to 25
2016-02-02 20:42:20 +00:00
NewGarbo
9fa5927240
siege weapon base progress
2016-02-02 19:41:25 +00:00
Thanos paravantis
854ebf70c4
Merge branch 'master' into thanos-mineware
...
Conflicts:
Plugins/Mineplex.Core/.classpath
Plugins/Mineplex.Queuer/.settings/org.eclipse.jdt.core.prefs
Plugins/Nautilus.Game.Arcade/.classpath
Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.ui.prefs
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/MineWare.java
2016-02-02 17:11:22 +02:00
Thanos paravantis
96cc73fcb7
Change challenge death handling, refatoring.
2016-02-02 17:07:04 +02:00
phobia
59e564cdc6
Fixes to war point evasion
2016-02-02 23:18:05 +11:00
phobia
f1c49fa5ee
Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha
2016-02-02 22:13:38 +11:00
phobia
8a0f585432
Added fix to WarPoint evasion bug + 1 dmg bug
2016-02-02 22:11:52 +11:00
Shaun Bennett
86917fb146
Fix treasure stair orientation
2016-02-02 05:50:03 -05:00
Shaun Bennett
a34ae8cf49
Merge remote-tracking branch 'remotes/origin/master' into develop
2016-02-02 05:37:30 -05:00
Shaun Bennett
0d02f526b6
Merge pull request #116 in MIN/mineplex from bugfix/duplicates to develop
...
* commit 'af27944a39129454b2963707c27799643d2440f1':
add a shard queue to DonationManager, use that for TreasureShardReward
Import clean up
Changed TreasureShard rewarding, removed Queue
Unused import removed
Queue speed up
Debugs removed
Treasure not giving Shards when dupes occur, fixed.
Queue implemented for duplicate shard reward
2016-02-02 04:35:44 -06:00
Shaun Bennett
af27944a39
add a shard queue to DonationManager, use that for TreasureShardReward
2016-02-02 05:34:33 -05:00
Keir Nellyer
a51c579f74
Fix Maven configuration for ReportServer project.
2016-02-01 22:52:24 +00:00
Keir Nellyer
eb329ec845
Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
2016-02-01 22:38:51 +00:00
Cheese
610522bdd9
mac fix
2016-02-02 09:25:46 +11:00
Shaun Bennett
ee9e26e8ca
Merge pull request #149 in MIN/mineplex from bugfix/spectator-infest to develop
...
* commit 'ace7d1764c68f6ea679ae60b3104d1af96e1869c':
Fixed various ways of players going invisible through Spec mode.
2016-02-01 16:18:23 -06:00
Shaun Bennett
1a9c36d0a1
Merge pull request #153 in MIN/mineplex from master to bugfix/duplicates
...
* commit '3a945f190dca9f558cbcb6052b3eaa2816d112b3': (308 commits)
Commons codec is not included in BungeeCord.
Pooling with later jedis versions doesn't work on Bungee.
Gitignore redundant Eclipse files.
Add Eclipse magic.
Speed up LobbyBalancer to 500ms
Add example maven settings.xml
Remove setTestOnBorrow
Tone down lobby balancer too.
Emergency patch to slow down redis player count updates.
Fixed explosions dropping right items.
sapling fix
Update fixes - @Teddy!
Made block define its own drops.
Removed an nunnecesarry method
Fixed items not dropping their regular counterpart.
Final changes
Prep for update
Update CB.jar
Prevent hearts changing colors in UHC tab.
Fixed ForTheKing achievement.
...
2016-02-01 15:49:34 -06:00
Virizion
41ea96d505
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2016-02-01 16:42:55 -05:00
Virizion
989c324a37
Hopper item pickup fix.
2016-02-01 16:18:40 -05:00
NewGarbo
04ec8a6a26
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
...
Conflicts:
Plugins/pom.xml
2016-02-01 20:10:51 +00:00
NewGarbo
84b887fe89
that's not needed
2016-02-01 19:53:59 +00:00
NewGarbo
b4ed912f7d
siege weapon modular system beginnings
2016-02-01 19:52:53 +00:00
md_5
1e57f19bd6
Commons codec is not included in BungeeCord.
2016-02-01 18:18:23 +11:00
md_5
e887bbf543
Pooling with later jedis versions doesn't work on Bungee.
2016-02-01 18:13:50 +11:00
Keir Nellyer
b547ad5f89
Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
2016-01-31 23:38:58 +00:00
md_5
cc1ecbe0b8
Add Eclipse magic.
2016-02-01 10:24:49 +11:00
Thanos paravantis
de1ee4f6cb
Spectator and chicken attack changes.
2016-01-31 23:50:23 +02:00
NewGarbo
45aacd626e
this isn't used anymore
2016-01-31 19:20:15 +00:00
Keir Nellyer
9601eabfeb
Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2016-01-31 17:38:08 +00:00
NewGarbo
cc857da88e
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
2016-01-31 16:27:14 +00:00
NewGarbo
002be01ef1
MAVEN TEST COMMIT
2016-01-31 16:21:04 +00:00
NewGarbo
a5439943d6
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-01-31 15:47:52 +00:00
Mysticate
ace7d1764c
Fixed various ways of players going invisible through Spec mode.
2016-01-31 10:22:59 -05:00
Thanos paravantis
1f22883c13
Refactoring challenge selection and updating.
2016-01-31 16:57:54 +02:00
md_5
852f96a314
Speed up LobbyBalancer to 500ms
2016-01-31 09:45:34 +11:00
md_5
478b92db44
Add example maven settings.xml
2016-01-31 09:44:46 +11:00
Shaun Bennett
b9354b7972
Remove setTestOnBorrow
2016-01-30 16:10:30 -05:00
Thanos paravantis
0e1a14a0c3
Countdown modifications, refactoring, dogs vs cats challenge changes.
2016-01-30 21:52:18 +02:00
Thanos paravantis
69dc888657
Refactoring.
2016-01-30 21:07:00 +02:00
Thanos paravantis
215fe68575
Start code refactoring.
2016-01-30 17:19:33 +02:00
Thanos paravantis
e3a9f4f2f7
Chicken attack changes, refactoring, update map crumble variable access.
2016-01-30 14:14:55 +02:00
phobia
9c83c64d01
Fixed issues with Broadsword
...
Added max building height of 100
2016-01-30 21:34:06 +11:00
phobia
4612550ba5
Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha
2016-01-30 19:24:42 +11:00
phobia
aa0cfc7710
Fixes to TnTGeneration
...
Fixes to Broadsword giving Generation and slowness 42 instead of 4
2016-01-30 19:23:59 +11:00
Shaun Bennett
52b6779a4f
Merge pull request #146 in MIN/mineplex from bugfix/bridges-ore-stealing to develop
...
* commit 'b45e00796d66cf8aeb39510e0bd23bc5bd59327b':
Fixed explosions dropping right items.
Made block define its own drops.
Removed an nunnecesarry method
Fixed items not dropping their regular counterpart.
2016-01-30 01:45:00 -06:00
Shaun Bennett
c23855bd65
Merge with develop
2016-01-30 02:44:24 -05:00
md_5
1f2fc65f99
Tone down lobby balancer too.
2016-01-30 13:55:58 +11:00
md_5
7ed0ab442f
Emergency patch to slow down redis player count updates.
2016-01-30 12:36:20 +11:00
Keir Nellyer
8cf32ef8bf
Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
2016-01-30 00:46:43 +00:00
Keir Nellyer
253f5cc664
Improve our English slightly.
2016-01-29 23:12:50 +00:00
Thanos paravantis
c5a9f0c42c
Chicken attack bug fixes, death effect improvements.
2016-01-30 00:13:41 +02:00
Mysticate
b45e00796d
Fixed explosions dropping right items.
2016-01-29 15:58:49 -05:00
NewGarbo
fe01c9b8d5
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-01-29 20:57:10 +00:00
NewGarbo
d10266c4d1
sapling fix
2016-01-29 20:56:38 +00:00
NewGarbo
7d28bc69c9
collision boxes on siege weapons and other stuff
2016-01-29 20:55:56 +00:00
NewGarbo
76dba421b4
sapling fix [THIS NEEDS TO GET PUT ONTO CLANS/ALPHA]
2016-01-29 20:54:31 +00:00
Shaun Bennett
1c3c800a66
Update fixes - @Teddy!
2016-01-29 14:05:09 -05:00
Thanos paravantis
0530ea28e7
Improve chicken attack, fix mini oitq arrow damage.
2016-01-29 19:15:37 +02:00
Mysticate
1e29bd6936
Made block define its own drops.
2016-01-29 11:44:40 -05:00
Mysticate
447583aa2a
Removed an nunnecesarry method
2016-01-29 09:41:45 -05:00
Mysticate
075a1141f1
Fixed items not dropping their regular counterpart.
2016-01-29 09:36:09 -05:00
Shaun Bennett
c1f91cbfb0
Final changes
2016-01-29 03:56:49 -05:00
Shaun Bennett
50fc1f5a10
merge with develop
2016-01-29 03:44:04 -05:00
Shaun Bennett
d30fb8d8ef
Merge remote-tracking branch 'origin/clans/alpha' into clans/alpha
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2016-01-29 03:40:28 -05:00
Shaun Bennett
a1f9f41910
Merge remote-tracking branch 'origin/develop' into develop
2016-01-29 03:37:03 -05:00
Shaun Bennett
863be023d9
Prep for update
2016-01-29 03:36:52 -05:00
Shaun Bennett
2e2a08bea8
Merge pull request #142 in MIN/mineplex from bugfix/coal-particles to develop
...
* commit 'd1d3382ec065bb7c508044d53124266fda142c00':
Prevented Coal particles from showing during the game
2016-01-29 02:33:57 -06:00
Shaun Bennett
ba0dd3da44
Merge pull request #141 in MIN/mineplex from bugfix/bridges-ore-stealing to develop
...
* commit 'b92ddc75759bc848b409b5626f0fbeb9d71154b5':
Added proper ore pickup delay.
2016-01-29 02:33:23 -06:00
Shaun Bennett
a0e9a82327
Merge pull request #143 in MIN/mineplex from bugfix/achievements-misc to develop
...
* commit '7d33e76055eb160e58d63443a72117e654df9468':
Fixed ForTheKing achievement.
Made sure Sniper achievement in Bridges is always fulfilled.
Fixed + Tidied Gladiators Precision achievement.
2016-01-29 02:32:50 -06:00
Shaun Bennett
63fa942789
Merge pull request #144 in MIN/mineplex from bugfix/uhc-hearts to develop
...
* commit 'caa5d922b520da30223230b58754a77dd3b72186':
Prevent hearts changing colors in UHC tab.
2016-01-29 02:27:20 -06:00
libraryaddict
dc469b9562
Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into develop
2016-01-29 17:02:07 +13:00
libraryaddict
8aac172c4a
Update CB.jar
2016-01-29 17:01:48 +13:00
Mysticate
caa5d922b5
Prevent hearts changing colors in UHC tab.
2016-01-28 22:54:20 -05:00
Mysticate
7d33e76055
Fixed ForTheKing achievement.
2016-01-28 22:51:19 -05:00
Mysticate
733ba067fe
Made sure Sniper achievement in Bridges is always fulfilled.
2016-01-28 22:49:51 -05:00
Mysticate
fffa1d5926
Fixed + Tidied Gladiators Precision achievement.
2016-01-28 22:48:52 -05:00
Mysticate
d1d3382ec0
Prevented Coal particles from showing during the game
2016-01-28 22:44:33 -05:00
Mysticate
b92ddc7575
Added proper ore pickup delay.
2016-01-28 22:39:48 -05:00
Shaun Bennett
60ee5d1da0
Move disable custom inside of IsActive check
2016-01-28 22:33:48 -05:00
Shaun Bennett
eb29c6b367
Fix constructor
2016-01-28 22:28:18 -05:00
Shaun Bennett
0177cf91bb
Merge with develop
2016-01-28 22:23:17 -05:00
Shaun Bennett
40f6969413
Merge remote-tracking branch 'origin/develop' into develop
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-01-28 22:16:15 -05:00
Shaun Bennett
051d70771b
Facebook Command
2016-01-28 22:15:35 -05:00
Shaun Bennett
251fb53f29
Merge pull request #124 in MIN/mineplex from bugfix/morph to develop
...
* commit '2e433d8b0654507a9a41d9bbae313ab90e92471f':
Made sure that the active morph gets disabled on clear
2016-01-28 21:08:32 -06:00
Shaun Bennett
bf273708f9
Merge pull request #136 in MIN/mineplex from feature/entity-spectating to develop
...
* commit '53132a248f9d899e2b4b275a31cfd69376533688':
the L
Updateting spectator Menu layout.
fixing spec item in menu
Removing right clicking.
removing switching players until spigot patch is on.
adding spectator rotation.
adding entity spectating by right clicking and right clicking head in compass menu.
2016-01-28 21:08:13 -06:00
Shaun Bennett
015cca57b6
Merge pull request #138 in MIN/mineplex from bugfix/gladiators-hotbar-editor to develop
...
* commit '75629055d851265e91eb7d0679a40a1357552e17':
Un-register HotbarEditor MiniPlugin and fix /spec bug.
Un-register the hotbar page listener on disable.
2016-01-28 21:03:48 -06:00
Shaun Bennett
f72ee95759
Merge pull request #139 in MIN/mineplex from virizion_speed_builder to develop
...
* commit 'b6db99806ab171774ffd9c9db11cf361ad76dc94': (83 commits)
Remove debug message.
Fix flickering judge laser.
Borders for spec are fixed.
Leaves fix.
Fix dupe scoreboard entries. Make it so perfect builders can't fill or empty bucket.
Make dependable require 50 perfect builds instead of 10.
Multiply by less
negative!
Trying different hologram location
Fix messages, fix /stats
Center hologram
Make achievement category classics
hologram changes
Holograms maybe?
Chiss' checklist.
Remove unnecessary tabs. Make the judge guardian use it's own laser again.
Fixed builds with only mobs not loading.
Fixed mobs.
TICK TICK TICK TICK.
all players equal, no one loses
...
2016-01-28 21:02:23 -06:00
NewGarbo
7860ca24c8
disallow all staff from using /we
2016-01-28 23:33:06 +00:00
NewGarbo
f86262dc0e
catapult and cannon progress
2016-01-28 23:32:23 +00:00
Virizion
b6db99806a
Remove debug message.
2016-01-28 18:28:43 -05:00
teddy
96ea001291
Clean up
2016-01-28 23:05:27 +00:00
teddy
da8a55f99c
Final edits
2016-01-28 22:57:54 +00:00
William Burns
75629055d8
Un-register HotbarEditor MiniPlugin and fix /spec bug.
2016-01-28 20:43:58 +00:00
Virizion
04544c2b8d
Fix flickering judge laser.
2016-01-28 14:28:47 -05:00
William Burns
d44d4c2278
Un-register the hotbar page listener on disable.
2016-01-28 19:21:42 +00:00
teddy
63cea58f05
Waiting for a testing session.
2016-01-28 17:18:24 +00:00
NewGarbo
37fb656279
dispenser
2016-01-28 13:31:45 +00:00
NewGarbo
f645c4d6f8
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
2016-01-28 13:30:50 +00:00
NewGarbo
88c1391ba2
disallow sapling in dispensers (grrr working in two different branches is really strange)
2016-01-28 13:30:16 +00:00
NewGarbo
8cb5591218
merge conflicts
2016-01-28 13:28:39 +00:00
NewGarbo
a0cc0b7ec9
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/Gameplay.java
2016-01-28 13:28:00 +00:00
NewGarbo
b5f04011e5
fixed chatslow not working + filter not working for players not in clan
2016-01-28 13:24:30 +00:00
Keir Nellyer
5f14670bc2
Remove old redundant iml file.
2016-01-28 11:20:40 +00:00
NewGarbo
ceeeb3bc45
no tnt from dispensers
2016-01-28 10:58:46 +00:00
teddy
eed55b48ac
Descriptions changed
2016-01-28 09:55:48 +00:00
NewGarbo
682a243c31
fixed catapult state being mapped to incorrect blocks
2016-01-28 09:18:58 +00:00
Keir Nellyer
3fc11e5c8a
For some reason this didn't get committed with the previous stuff.
2016-01-27 21:54:34 +00:00
Keir Nellyer
ac37417fca
Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/.idea/modules.xml
2016-01-27 21:44:04 +00:00
Teddy
70be135a40
Merge branch 'feature/hoverable-chat' of http://dev.mineplex.com:7990/scm/min/mineplex into rankdescriptions
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/typewars/TypeWars.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java
2016-01-27 19:42:11 +00:00
AlexTheCoder
b84ec01597
- Huge amount of stuff
2016-01-26 22:52:45 -05:00
Shaun Bennett
3d4cd9ee27
Fix tutorial command, add tutorial info to scoreboard, message manager, transitioning to a visual manager
2016-01-26 17:47:01 -06:00
Virizion
40113f99d3
Borders for spec are fixed.
2016-01-26 17:14:21 -05:00
NewGarbo
7f7e73a101
more catapults!
2016-01-26 21:10:58 +00:00
NewGarbo
3d7a371d1d
catapults
2016-01-26 20:18:53 +00:00
Shaun Bennett
155d8bff1b
Fix cannon angles
2016-01-26 13:36:30 -06:00
NewGarbo
9215d0d3ff
NegativeArraySizeException fix
2016-01-26 18:40:55 +00:00
NewGarbo
63f9622876
cannon correctly loadded title + fixed rotation being all wrong
2016-01-26 17:51:29 +00:00
NewGarbo
7c85fe62ca
charred blocks updates
2016-01-26 17:36:12 +00:00
NewGarbo
2445e73623
better cannon crater particles
2016-01-26 13:06:47 +00:00
NewGarbo
3b18b93286
fixed top right slot in cannon not counting as an empty slot.
2016-01-26 09:26:51 +00:00
NewGarbo
467af4b835
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
2016-01-26 09:24:53 +00:00
Virizion
2f4146c243
Leaves fix.
2016-01-25 21:12:28 -05:00
Virizion
c5dfddd710
Fix dupe scoreboard entries. Make it so perfect builders can't fill or empty bucket.
2016-01-25 20:54:01 -05:00
Virizion
a1eec79b3b
Make dependable require 50 perfect builds instead of 10.
2016-01-25 16:43:43 -05:00
NewGarbo
e68dea65e1
stop dispensers being used for flint-andsteal, bonemeal etc etc
2016-01-25 17:46:39 +00:00
NewGarbo
18e892c4ec
finally fixed that windblade dupe
2016-01-25 17:41:07 +00:00
NewGarbo
71bb1ed3d6
this is just really slowing down startup time by A LOT
2016-01-25 17:22:56 +00:00
NewGarbo
9d77632fcc
allow clans moderators to use /cb
2016-01-25 17:18:00 +00:00
NewGarbo
2bf2050844
increased sapling cooldown to 20 minutes from one second.
2016-01-25 17:13:53 +00:00
NewGarbo
7f1c74ced5
bumped version up to 0.19
2016-01-25 17:11:08 +00:00
NewGarbo
2b70daf8df
allowed clans mods to use /cban
2016-01-25 17:02:49 +00:00
NewGarbo
5a5dc9925e
set spawning rate of charred blocks a 10% lower
2016-01-25 17:02:26 +00:00
NewGarbo
208df93739
fixed fire particles not showing up in craters
2016-01-25 17:02:02 +00:00
NewGarbo
ce36cf79bf
added a tnt limit, set to 1 as it makes gameplay better
2016-01-25 17:01:46 +00:00
NewGarbo
9b88683fdc
fix cannon tnt exploding prematurely, added cooldown rather than using Recharge.
2016-01-25 17:00:38 +00:00
Sarah
53132a248f
the L
2016-01-25 12:28:21 +01:00
Sarah
c7733bb068
Updateting spectator Menu layout.
2016-01-25 12:27:19 +01:00
Sarah
91b6ae8b09
fixing spec item in menu
2016-01-25 12:14:56 +01:00
Shaun Bennett
4314f35f80
Multiply by less
2016-01-25 04:46:47 -06:00
Shaun Bennett
b143ec7c19
negative!
2016-01-25 04:42:09 -06:00
Shaun Bennett
6ff7c83d3e
Trying different hologram location
2016-01-25 04:17:58 -06:00
Shaun Bennett
616be8aea7
Fix messages, fix /stats
2016-01-25 03:59:37 -06:00
Shaun Bennett
d511ca5bad
Merge remote-tracking branch 'origin/virizion_speed_builder' into virizion_speed_builder
2016-01-25 03:51:44 -06:00
Shaun Bennett
bc8f6e511c
Center hologram
2016-01-25 03:44:22 -06:00
Virizion
2dcc356aab
Make achievement category classics
2016-01-25 04:33:25 -05:00
Shaun Bennett
61f1a58b1c
hologram changes
2016-01-25 03:29:53 -06:00
Shaun Bennett
181cce4774
Holograms maybe?
2016-01-25 03:08:56 -06:00
NewGarbo
33845cbc72
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
2016-01-25 08:48:13 +00:00
NewGarbo
fde5a5af28
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
2016-01-25 08:47:08 +00:00
NewGarbo
5b32911a42
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-01-25 08:46:26 +00:00
NewGarbo
0b7cec60ae
put cmod above support so that support can't bypass clans home block
2016-01-25 08:44:17 +00:00
NewGarbo
d82a7b353f
allow C.Mods to join all server regardless of home servers
2016-01-25 08:42:38 +00:00
NewGarbo
54fa1449f6
cannon crater changes
2016-01-25 08:40:59 +00:00
Virizion
219b86ae55
Chiss' checklist.
2016-01-25 03:01:54 -05:00
Sarah
31ef7ffe19
Removing right clicking.
2016-01-25 07:45:38 +01:00
Sarah
f722831e6a
removing switching players until spigot patch is on.
2016-01-25 05:44:06 +01:00
Sarah
9e63c9000a
adding spectator rotation.
2016-01-25 04:30:42 +01:00
Virizion
bfe9aa7a59
Remove unnecessary tabs. Make the judge guardian use it's own laser again.
2016-01-24 21:55:57 -05:00
Virizion
0eda813d41
Fixed builds with only mobs not loading.
2016-01-24 19:14:34 -05:00
NewGarbo
c43c09fd3c
the cannons shouldn't explode instantly! also added fire effects to craters + clan tips when hopping on a cannon
2016-01-24 21:45:46 +00:00
NewGarbo
0252436990
cannons updates
2016-01-24 20:56:47 +00:00
Sarah
00f01e09af
adding entity spectating by right clicking and right clicking head in compass menu.
2016-01-24 20:00:05 +01:00
NewGarbo
a41521d6a9
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/safelog/SafeLog.java
2016-01-23 13:42:25 +00:00
NewGarbo
1f7e1fb6cf
fix dupe bug and safelog
2016-01-23 13:40:49 +00:00
Thanos paravantis
70588d81a8
Update /stats menu to display mineware achievements item.
2016-01-23 14:51:47 +02:00
NewGarbo
24011c4af4
cannons work
2016-01-23 12:46:52 +00:00
Thanos paravantis
72fb2317b9
Update team creation and winner placement, fix NPE on Veteran Tracker.
2016-01-23 14:31:36 +02:00
Virizion
a747426fa0
Fixed mobs.
2016-01-23 05:00:14 -05:00
Virizion
a359c4f8b6
Merge branch 'virizion_speed_builder' of ssh://dev.mineplex.com:7999/min/mineplex into virizion_speed_builder
2016-01-23 03:42:50 -05:00
Virizion
1e732b08e7
TICK TICK TICK TICK.
2016-01-23 03:42:36 -05:00
Cheese
790e2e8f73
Merge branch 'virizion_speed_builder' of ssh://184.154.0.242:7999/min/Mineplex into virizion_speed_builder
2016-01-23 19:32:37 +11:00
Cheese
c1ff7f4fc2
all players equal, no one loses
2016-01-23 19:32:23 +11:00
Virizion
a75770b0a6
Change build to load from top instead of bottom.
2016-01-23 03:15:41 -05:00
Shaun Bennett
650d586e0f
Add perfect build count to stats
2016-01-23 02:49:08 -05:00
Shaun Bennett
f82a408f30
Build time modifiers
2016-01-23 02:43:41 -05:00
Virizion
5dc773032b
Add joining players to guardians team instead of spectator.
2016-01-23 02:10:11 -05:00
Virizion
245cc1ed93
Limit Perfectionist achievement to 1.
2016-01-22 22:18:29 -05:00
Shaun Bennett
311d42db30
Use Garbo's description changes
2016-01-22 19:48:06 -05:00
Shaun Bennett
231b8cb19a
Merge pull request #133 in MIN/mineplex from bugfix/foo to develop
...
* commit '376f719c261bd2152a6646a152472a2485e1b689':
fixes important bug, fixed a scary typo!
Lots of typo fixes and such
i before e!
fixed cosmetic menu item dropping bug
more grammatical errors hast been fixed
Grammatical errors hath been fixed!
2016-01-22 18:38:26 -06:00
Shaun Bennett
b2e4dff9e5
Add time to perfect build message
2016-01-22 19:18:23 -05:00
Shaun Bennett
02b45bd302
Forgot to register stat tracker
2016-01-22 19:14:25 -05:00
Shaun Bennett
ddc86f0897
Add Speediest Builderizer achievement
2016-01-22 19:13:23 -05:00
Shaun Bennett
d0e5be9c93
Guardian is impressed (untested!)
2016-01-22 18:35:18 -05:00
Thanos paravantis
a74d4fa960
Working on chicken attack when a player looses all of his lives.
2016-01-22 23:59:29 +02:00
NewGarbo
bf6f1a1701
sapling stuff messed up oops
2016-01-22 15:28:12 +00:00
NewGarbo
090b6e496a
sapling stuff messed up oops
2016-01-22 15:27:44 +00:00
NewGarbo
c524247777
supplies command for sieges
2016-01-22 15:27:10 +00:00
NewGarbo
6638562866
npe fix
2016-01-22 15:21:20 +00:00
NewGarbo
f25c7b0277
don't need that + npe fix
2016-01-22 15:19:32 +00:00
NewGarbo
b869d4a7a8
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
2016-01-22 15:16:20 +00:00
NewGarbo
c4bbeb2535
more control over saplings
2016-01-22 14:55:50 +00:00
NewGarbo
a377a09925
fixed wind blade dupe bug
2016-01-22 11:22:20 +00:00
NewGarbo
cc48d98208
pushing to beta to change to alpha
2016-01-22 11:06:19 +00:00
Virizion
3f715ab4dd
Enable inventory click.
2016-01-22 02:23:58 -05:00
Shaun Bennett
4bbd956e14
Don't use the same build twice (untested!)
2016-01-22 01:37:47 -05:00
Shaun Bennett
49e439af55
Merge remote-tracking branch 'origin/virizion_speed_builder' into virizion_speed_builder
2016-01-22 01:28:09 -05:00
Shaun Bennett
6bb60ddebd
Ignore empty builds (untested!)
2016-01-22 01:27:29 -05:00
Virizion
c66f37817e
Fixed invis bug.
2016-01-22 01:22:31 -05:00
Virizion
5c83f5c1e5
Renamed to Speed Builders from Speed Builder.
2016-01-22 00:20:58 -05:00
Virizion
0da921f3d2
Removed debug thing.
2016-01-21 23:52:59 -05:00
Virizion
a38319147a
Stopped physics which fixed the torch bug.
2016-01-21 23:49:49 -05:00
Shaun Bennett
582fa4c915
Merge remote-tracking branch 'origin/virizion_speed_builder' into virizion_speed_builder
2016-01-21 22:42:33 -05:00
Shaun Bennett
c38596a09f
Name the guardian, 10 seconds to view builds
2016-01-21 22:42:25 -05:00
Virizion
24e97176cc
Call clear build area method on eliminate.
2016-01-21 22:05:30 -05:00
Virizion
d37b8b40fc
Disable item merge to (hopefully) fix phantom rails.
2016-01-21 20:41:28 -05:00
Virizion
50c9b33701
Merge branch 'virizion_speed_builder' of ssh://dev.mineplex.com:7999/min/mineplex into virizion_speed_builder
2016-01-21 20:13:53 -05:00
Virizion
636da8f4fa
Mob destroying. Removed a debug change that only selected builds with mobs in them.
2016-01-21 20:13:32 -05:00
Cheese
5675aed698
velocity the drops to the player
2016-01-22 11:56:52 +11:00
Virizion
69825893c9
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2016-01-21 19:11:36 -05:00
Virizion
6ab6307f74
Pushing all my stuff for Shaunpai.
2016-01-21 19:08:38 -05:00
Shaun Bennett
877ec4710e
Removing duplicate NCP hooks
2016-01-21 17:22:10 -05:00
Shaun Bennett
3803a3d82e
Add player heads back to friends lsit
2016-01-21 17:19:51 -05:00
Shaun Bennett
0fd5540de6
Merge pull request #132 in MIN/mineplex from bugfix/give-item-offline to develop
...
* commit '404e049c31df6d4278ee3ed46e7f0b8e2f92ee16':
Give item fix for offline players
2016-01-21 15:44:34 -06:00
Shaun Bennett
a41816ca22
Include version.properties in Mineplex.Core
2016-01-21 16:37:35 -05:00
Shaun Bennett
a0f39bf36e
Merge remote-tracking branch 'origin/develop' into develop
2016-01-21 16:31:52 -05:00
Thanos paravantis
44de231c7d
Start implementing chicken attack on player death.
2016-01-21 21:35:14 +02:00
Shaun Bennett
64ec092d09
Rename coin command to shard command
2016-01-21 09:10:39 -05:00
Teddy
1e72ebcbe6
Merge branch 'master' into rankdescriptions
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2016-01-21 12:54:12 +00:00
Keir Nellyer
dd0fc23467
Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
2016-01-21 10:12:02 +00:00
md_5
447583624e
Fix ascii.png duplication.
2016-01-21 17:47:21 +11:00
Shaun Bennett
5af8d747b3
Merge remote-tracking branch 'origin/develop' into develop
2016-01-20 15:07:48 -05:00
Shaun Bennett
269cd710fc
Fix wrong group id for spigot excludes
2016-01-20 15:07:39 -05:00
Shaun Bennett
c0d4fa1bea
Merge pull request #125 in MIN/mineplex from bugfix/mb-wins to develop
...
* commit '4924d652f555392c9e36feb05a64cccd61b6c594':
Store winner UUID instead of Player object to avoid leaking excess data
Fixed who the winner is in MB Games.
2016-01-20 12:33:56 -06:00
Shaun Bennett
4924d652f5
Store winner UUID instead of Player object to avoid leaking excess data
2016-01-20 13:33:40 -05:00
Shaun Bennett
7715df8e6a
Merge pull request #130 in MIN/mineplex from md_5/servermonitor/leak to develop
...
* commit '55c54eeff4dc72619fc9be1bb724b9dd37804919':
Fix ServerMonitor not actually removing ServerGroup instances.
2016-01-20 12:24:33 -06:00
Shaun Bennett
359655f417
Merge pull request #131 in MIN/mineplex from md_5/suspicious to develop
...
* commit '4927bb8c0b6b1fcebe41adf9f38489fe82116cfa':
Fix some misc suspicious calls to Collection methods.
2016-01-20 12:23:55 -06:00
Shaun Bennett
c7bb380a56
Merge pull request #128 in MIN/mineplex from md_5/mineplexer/leak to develop
...
* commit '6cf08193dfbedb08352fd3a450022afac0ecd331':
Fix small memory leak in Mineplexer.
2016-01-20 12:23:13 -06:00
Shaun Bennett
0a5791a92f
Go back to compile scope, need to talk to md_5 about this
2016-01-20 13:13:20 -05:00
Shaun Bennett
037a2f8353
Change craftbukkit to provided scope, add ascii.png to Hub and Arcade, new /bversion command
2016-01-20 13:04:31 -05:00
Shaun Bennett
8977735baf
Include a version.properties in maven build
2016-01-20 11:57:21 -05:00
Shaun Bennett
8017da9413
Delete JedisTest
2016-01-20 10:25:31 -05:00
Shaun Bennett
ea315a1447
Merge remote-tracking branch 'remotes/origin/md_5/maven' into develop
...
# Conflicts:
# Plugins/Libraries/craftbukkit.jar
2016-01-20 10:19:09 -05:00
Shaun Bennett
77d9f7cf32
Merge branch 'master' into develop
2016-01-20 10:12:20 -05:00
fooify
376f719c26
fixes important bug, fixed a scary typo!
2016-01-19 18:52:54 -08:00
md_5
bb4091c7a6
Use Maven for Compilation
2016-01-20 11:20:58 +11:00
Teddy
573d0dd67d
Stats added for all other games
2016-01-19 23:10:45 +00:00
Shaun Bennett
9884742552
Fix OrderedObjectives, Starting CombatTutorial work
2016-01-19 16:34:51 -05:00
Shaun Bennett
80d55b2c9c
It works!
2016-01-19 13:34:17 -05:00
Shaun Bennett
0f83263871
Merge remote-tracking branch 'remotes/origin/clans/beta' into clans/tutorial
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
2016-01-19 11:01:11 -05:00
Shaun Bennett
947ce254da
Tutorial Gui, Fixes
2016-01-19 10:59:56 -05:00
William Burns
7af8d78fc3
Add resource pack and other fixes
2016-01-19 14:00:23 +00:00
Shaun Bennett
951c27123a
Remove /disguise for YOUTUBE_SMALL in arcade
2016-01-18 22:10:01 -05:00
Teddy
c52bc8024c
Halloween, added kit to stats
2016-01-18 11:41:30 +00:00
Teddy
740eeae9bd
Halloween, added stats
2016-01-18 11:40:46 +00:00
Teddy
3fc25359be
Gravity, added stats
2016-01-18 11:38:43 +00:00
Teddy
b22f452b1f
Gladiators, added stats
2016-01-18 11:36:16 +00:00
Teddy
297e9baf41
Evolution, added stats
2016-01-18 11:34:43 +00:00
Teddy
f3d27c9d93
Draw my thing, added stats
2016-01-18 11:32:40 +00:00
Teddy
3d88f5aaae
Dragons, added stats
2016-01-18 11:11:32 +00:00
Teddy
ba50b5fdb1
Dragon Riders, added default registery
2016-01-18 11:09:19 +00:00
Teddy
c3d9be2123
Dragon Escape Teams, added stats
2016-01-18 11:05:09 +00:00
Teddy
85f4ee50f0
Dragon Escape, added stats + implemented kit display for stats
2016-01-18 11:04:12 +00:00
Teddy
66f484760e
Death Tag, added stats
2016-01-18 10:53:56 +00:00
Teddy
96d16932dd
Christmas Chaos, added stats
2016-01-18 10:50:04 +00:00
Teddy
dc44207d7a
Champ TDM, added stats
2016-01-18 10:48:10 +00:00
Teddy
4e09aa4c34
Champ Dominate,added stats
2016-01-18 10:45:48 +00:00
Teddy
f79acaaa2a
Champ CTF,added stats
2016-01-18 10:43:46 +00:00
Teddy
508c4e99d2
Castle Siege,added stats
2016-01-18 10:41:10 +00:00
Teddy
b0eb5a6d4e
Cards Against Humanity, skipped/left blank
2016-01-18 10:34:43 +00:00
Teddy
56b3e482f2
Master Builders, added stats
2016-01-18 10:32:38 +00:00
Shaun Bennett
044d2bac83
Fix some Invisibility preference bugs
2016-01-17 22:55:04 -05:00
Shaun Bennett
2b6074a210
Merge remote-tracking branch 'remotes/origin/bugfix/disguise-command'
2016-01-17 22:46:56 -05:00
Shaun Bennett
976779b9f2
Tutorial Work
2016-01-17 22:45:38 -05:00
Sarah
5ed9295944
updating Hub command as well
2016-01-17 18:10:16 +01:00
Thanos paravantis
821ff58ab0
Merge branch 'master' into thanos-mineware
...
Conflicts:
.gitignore
2016-01-17 14:03:00 +02:00
md_5
4927bb8c0b
Fix some misc suspicious calls to Collection methods.
2016-01-17 20:20:48 +11:00
md_5
55c54eeff4
Fix ServerMonitor not actually removing ServerGroup instances.
2016-01-17 20:11:25 +11:00
Sarah
52bda30f85
Mysts OCD again......
2016-01-17 03:03:00 +01:00
Sarah
4a5d6b5f2a
Mysticates OCD....
2016-01-17 02:48:15 +01:00
Keir Nellyer
40833c80bd
Tiny spell fix.
2016-01-17 00:34:18 +00:00
Keir Nellyer
398c56983b
Retrieve player ranks from database and display them.
2016-01-16 23:45:37 +00:00
xGamingDudex
6e6f46671b
Merge remote-tracking branch 'origin/develop' into project-cosmetics
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilColor.java
Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCandyCane.java
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCoalFumes.java
2016-01-16 14:46:47 +01:00
xGamingDudex
8ee485e44c
Progress
2016-01-16 14:43:14 +01:00
md_5
6cf08193df
Fix small memory leak in Mineplexer.
...
* Leak was on line 74 (toString omitted when removing from String collection).
* Impact was actually pretty much nil - collection is rebuilt every minute.
* Side effect of optimization by using UUID itself which has a good hashCode and fast equals implementation.
2016-01-16 20:36:49 +11:00
NewGarbo
40c52ac557
made it so that cannons don't rely on outposts. this should help with testing them without needing an outpost
2016-01-16 08:25:30 +00:00
NewGarbo
254a2e45e4
comments + cannons state enum rename
2016-01-16 08:22:35 +00:00
NewGarbo
e71a2d2e48
quick npe fix
2016-01-16 08:20:11 +00:00
NewGarbo
1042edb134
CANNONZ!
2016-01-16 08:18:06 +00:00
William Burns
f22297418c
Clear full canvas at start fix
2016-01-15 19:08:25 +00:00
William Burns
733bfadf68
Added spray can tool
2016-01-15 18:52:26 +00:00
Sarah
410bc1c74b
not being able to disguise as banned/muted players
2016-01-15 19:12:50 +01:00
Teddy
c16a719be1
Bridges, added stats
2016-01-15 13:37:55 +00:00
Teddy
9cd7240b61
BouncyBalls, giving errors when Loading, skipping chat stats
2016-01-15 13:28:42 +00:00
Teddy
ec75169b70
BossBattles, giving errors when Loading, removed chat stats.
2016-01-15 13:07:21 +00:00
Teddy
3315a510dc
Barbarians stats added + Block break stat tracker added
2016-01-15 13:01:26 +00:00
Teddy
6a3e9ac19f
BaconBrawl stats added
2016-01-15 12:10:53 +00:00
NewGarbo
1faeb43b73
fixed iron block sometimes sticking around after placing cannon
2016-01-15 07:17:51 +00:00
NewGarbo
a554f1b7c6
needed to update some code with the cannon item location changing. also removed unused imports.
2016-01-15 07:00:39 +00:00
NewGarbo
f78c469875
moved cannon item to Cannon.java to be consistent with the outpost item being in Outpost.java
2016-01-15 06:59:18 +00:00
NewGarbo
e0b7be0813
made /meow give you 64 cannons and 64 outposts
2016-01-15 06:58:20 +00:00
NewGarbo
70444ff508
cannon + siege work with outposts, also moved outposts to the clans.siege package
2016-01-15 06:53:58 +00:00
Shaun Bennett
404e049c31
Give item fix for offline players
2016-01-14 08:06:27 -05:00
Mysticate
cf7f5af9ca
Fixed who the winner is in MB Games.
2016-01-14 07:41:36 -05:00
Mysticate
2e433d8b06
Made sure that the active morph gets disabled on clear
2016-01-14 07:17:40 -05:00
NewGarbo
595ab0d763
siege work
2016-01-14 09:46:12 +00:00
Teddy
d33d682ebb
Implementing stats for every game, got all stat names ready
2016-01-13 18:40:29 +00:00
Thanos paravantis
2ffaf61135
Rename methods starting with a capital letter, change several event method names and refactor classes and cleanup imports.
2016-01-13 18:40:37 +02:00
Keir
19301271a4
Fix format character.
2016-01-13 11:51:49 +00:00
Keir
26246604a7
This should've gone with the previous commit :/
2016-01-13 11:48:18 +00:00
Keir
53133d51ee
Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex 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-01-13 11:47:13 +00:00
Virizion
ee6425bbaf
Removed extra blank lines.
2016-01-12 23:31:35 -05:00
Virizion
dfd5a63b78
More changes and fixes.
2016-01-12 23:29:08 -05:00
fooify
63897b9b54
Merge remote-tracking branch 'origin/develop' into bugfix/foo
2016-01-12 20:05:34 -08:00
Virizion
528a7435e7
Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder
2016-01-12 20:25:08 -05:00
Virizion
b27d5849d8
General fixes.
2016-01-12 20:23:25 -05:00
NewGarbo
fb53e443e7
cleanup and cannons stuff
2016-01-12 20:27:24 +00:00
NewGarbo
f3003e795e
Implemented Outpost MK III
2016-01-12 18:59:01 +00:00
NewGarbo
6cde84ec5f
fixed outpost block placing/breaking boundary checking
2016-01-12 18:57:25 +00:00
NewGarbo
025f82e5ed
made the forcefield bump much weaker
2016-01-12 16:31:21 +00:00
Thanos paravantis
2795c858d7
Don't allow air blocks to be added to the block modification list. Add /skip without the need to use the async chat event.
2016-01-12 18:31:05 +02:00
Teddy
f1314d5c26
JSON now handled by JsonMessage Builder
2016-01-12 13:25:47 +00:00
NewGarbo
62f16ada81
that's not the correct bounds!
2016-01-12 07:57:35 +00:00
NewGarbo
5b4b5fb2b5
fixed outpost forcefield knocking you away even if the building is complete, also made the particles show the actual boundaries
2016-01-12 07:44:20 +00:00
libraryaddict
b1c6af4d1a
Update CB
2016-01-12 20:18:03 +13:00
NewGarbo
7d858c72f3
Merge branch 'clans/beta' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
2016-01-12 07:12:18 +00:00
NewGarbo
a6be919e4a
agh lost some code ;-;
2016-01-12 07:10:22 +00:00
NewGarbo
ed8d9459b2
goes with the commit below VVVV
2016-01-12 07:02:19 +00:00
NewGarbo
d3452772ed
outposts work (grr git is weird trying to switch over to clans/beta)
2016-01-12 07:02:03 +00:00
NewGarbo
c873b6b886
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-01-12 06:58:53 +00:00
libraryaddict
c3e11e87ea
Fix small issues with burning and ignition
2016-01-12 19:10:32 +13:00
libraryaddict
11da5a3fe1
Fix fire combusting and cancelled damage events
2016-01-12 18:56:48 +13:00
Shaun Bennett
4e9a4c87d4
Merge pull request #123 in MIN/mineplex from bugfix/disguise-command to develop
...
* commit '0f587ba5d908afdccb877358d71e56a3edda49cd':
fixing "Kicked for flying again" again...
2016-01-11 17:20:51 -06:00
Shaun Bennett
3693a2b2c5
Merge pull request #122 in MIN/mineplex from bugfix/thanos to develop
...
* commit 'ed439569453dc248623834af6fb553341779e46c':
Hub: Add dots at the end of stacker messages, prevent players from stacking bat blaster bats.
Remove unused imports.
Prevent players from stacking others with a menu inventory opened.
Hub: Hide stacker message when player clicks on an NPC. Display correct KOTH PvP Sword display name on player item drop.
2016-01-11 16:26:09 -06:00
Shaun Bennett
025b87c806
Merge pull request #121 in MIN/mineplex from feature/mutedsign to develop
...
* commit 'fa7eef504597011da14093fb76a8e088524eafd0':
Muted players can't write on signs.
2016-01-11 16:23:34 -06:00
Teddy
88c53bf464
Added default ChatStat for all games to prevent my server from dying when testing
2016-01-11 19:35:00 +00:00
NewGarbo
d656c7a212
fixed clans banned players counting as being online after joining and their territory then being blown up
2016-01-11 18:02:03 +00:00
Teddy
02ff8bdbdb
Custom stats working, escaping bug fix and List reset bug
2016-01-11 12:59:57 +00:00
Teddy
40d913beaf
Changed a List to reset each time its registered to prevent stats copying to the next game, automatic string escaping, party colour name changed to original colour
2016-01-11 12:35:44 +00:00
Teddy
b9d44d9a24
not updating properly, fixed
2016-01-11 12:14:29 +00:00
Teddy
78eaee98df
Typo mistake
2016-01-11 12:09:08 +00:00
Teddy
ec6e916c7b
more stable, progress for making 'easier-to-use'
2016-01-11 12:06:30 +00:00
NewGarbo
3773ab3f0b
fixed safelog npcs sticking around some time
2016-01-11 10:14:32 +00:00
NewGarbo
60a78e396f
remove legendary announcement in chat/middle text
2016-01-11 09:16:11 +00:00
Shaun Bennett
6c055c31a0
Fix flashing through doors, Update to 0.18c
2016-01-10 20:39:56 -05:00
NewGarbo
d5b5ac7bb0
changed regen level on giants broadsword from 4 to 3 and made slowness last longer so that screen doesn't glitch out
2016-01-10 23:06:39 +00:00
NewGarbo
d4ccb82791
didn't push this earlier
2016-01-10 23:03:16 +00:00
NewGarbo
6673081fb3
fixed LeechingAttribute from throwing an error when setting health above 20
2016-01-10 22:31:51 +00:00
NewGarbo
04c7f2c1f1
made pressure plates, buttons, and levers from working with block toss
2016-01-10 22:20:50 +00:00
Keir
1c49e3a111
Make chat log clickable, only close report instruction line suggests command.
2016-01-10 21:28:57 +00:00
NewGarbo
bccee71ff7
made signs placed by muted players get cleared on being placed
2016-01-10 21:16:49 +00:00
NewGarbo
734351011a
made all old clans ban clients get unloaded. there seems to have been problems with certain clients not unloading.
2016-01-10 21:15:50 +00:00
NewGarbo
9c3a62a308
made it so punished players can't place signs
2016-01-10 21:03:34 +00:00
NewGarbo
68808efb49
made players not be able to chat while chat is silenced
2016-01-10 20:57:12 +00:00
NewGarbo
fa3de2a479
made clans ban messages not public
2016-01-10 20:55:29 +00:00
NewGarbo
51872faa04
fix mutes not working
2016-01-10 20:53:55 +00:00
Mysticate
fa7eef5045
Muted players can't write on signs.
2016-01-10 13:13:38 -05:00
Teddy
5caeb8bee0
even nicer visual
2016-01-10 17:34:15 +00:00
Teddy
c814132b24
ratio's and nicer visuals
2016-01-10 17:33:18 +00:00
Teddy
83375a6883
stats not updating
2016-01-10 16:01:40 +00:00
Teddy
1bce624ab3
Finally got rid of MalformedJSON
2016-01-10 15:13:11 +00:00
Thanos paravantis
ed43956945
Hub: Add dots at the end of stacker messages, prevent players from stacking bat blaster bats.
2016-01-10 16:37:51 +02:00
Shaun Bennett
46695f8449
Fix hub fly for YOUTUBE_SMALL
2016-01-09 18:44:32 -05:00
Shaun Bennett
83e5c7399e
Fix YOUTUBE_SMALL preferences
2016-01-09 18:41:19 -05:00
Shaun Bennett
8193b5121b
Dont allow /disguise for YOUTUBE_SMALL
2016-01-09 18:39:47 -05:00
Shaun Bennett
cd3037e7e5
Fix treasure purchases
2016-01-09 18:37:24 -05:00
Keir
bd865c7e64
Fix command permissions.
2016-01-09 23:12:08 +00:00
Keir
7db3f3469f
Destroy pool when a thread ends.
2016-01-09 22:21:27 +00:00
Keir
5f362a878a
Run some Redis functions async (as it sometimes blocks).
2016-01-09 22:21:15 +00:00
Keir
8b3bc7ca18
Fix timezone, correct url prefix and remove old debug code.
2016-01-09 21:51:54 +00:00
fooify
942460b471
Merge remote-tracking branch 'origin/develop' into bugfix/foo
2016-01-09 13:05:44 -08:00
Teddy
263e1326cd
JSON progress
2016-01-09 20:22:29 +00:00
NewGarbo
fa509f0043
fixed giant's broadsword giving HUGE regen. PLEASE PUSH ASAP
2016-01-09 19:58:31 +00:00
Thanos paravantis
ce1bac8037
Remove unused imports.
2016-01-09 17:03:14 +02:00
Thanos paravantis
62e1fb3688
Prevent players from stacking others with a menu inventory opened.
2016-01-09 17:01:57 +02:00
xGamingDudex
f8e8669b5c
Added Party and Cupid set (arrow, jump, death, particle + full set
...
effect)
2016-01-09 14:07:40 +01:00
Sarah
0f587ba5d9
fixing "Kicked for flying again" again...
2016-01-09 12:07:57 +01:00
Thanos paravantis
ba3e7cb197
Merge branch 'master' into bugfix/thanos
2016-01-09 12:23:54 +02:00
Shaun Bennett
2df626b35e
Fix CustomDataManager crash
2016-01-08 18:06:33 -05:00
Shaun Bennett
511b39caa7
Merge branch 'master' into develop
2016-01-08 17:05:54 -05:00
Thanos paravantis
a1759a9fe3
Fix anvils not spawning from start and make the wave harder on anvil dance challenge.
2016-01-08 21:36:54 +02:00
Thanos paravantis
c1d65ed382
Do not allow score to increment above the max number on dogs vs cats challenge.
2016-01-08 17:51:00 +02:00
Thanos paravantis
45c40f5568
Fix map generation on mine a diamond challenge.
2016-01-08 17:35:17 +02:00
Keir
710654cd06
Use Validate class from Apache Commons to minify code.
2016-01-08 15:06:13 +00:00
Keir
7ce028203b
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
2016-01-08 13:59:43 +00:00
Keir
5cb91bb315
Allow reuse of ReportManager instance (for later use).
2016-01-08 13:59:30 +00:00
Teddy
43fb04b482
Import clean up
2016-01-08 13:46:57 +00:00
Teddy
78405749a4
Changed TreasureShard rewarding, removed Queue
2016-01-08 13:46:39 +00:00
Thanos paravantis
e114b623bd
Update water horror challenge to the latest version. Fix NPE on player quit.
2016-01-08 15:03:58 +02:00
Shaun Bennett
ee73b374a6
Forgot to uncomment in ClansLoginManager
2016-01-08 06:36:59 -05:00
Shaun Bennett
a75e2c15b8
Merge remote-tracking branch 'origin/develop' into develop
2016-01-08 06:35:37 -05:00
Shaun Bennett
15109707f3
Merge pull request #119 in MIN/mineplex from clans/alpha to develop
...
* commit '025615d080b8b925f319a2f7707d2c3fa4755a88':
Clans Alpha 0.18b fixes
2016-01-08 05:34:35 -06:00
NewGarbo
025615d080
Clans Alpha 0.18b fixes
2016-01-08 11:24:36 +00:00
Thanos paravantis
7d79a47093
Update water horror challenge to the latest version. Change death effect skull, hologram and particle height.
2016-01-08 13:21:20 +02:00
Sarah
5482d1dc40
Fixing "kicked for Flying"
2016-01-08 12:17:28 +01:00
Shaun Bennett
0a56a838d2
Fix ClansLoginManager, Remove pointless code in CoreClientManager
2016-01-08 05:45:49 -05:00
Shaun Bennett
6096fcad42
Fix hotbar issues
2016-01-08 04:06:11 -05:00
Shaun Bennett
504d9d508c
Slightly reduce Squid's Ink Blast damage in SSM
2016-01-08 03:15:30 -05:00
Shaun Bennett
1d2f61db8c
Disable purchasing Christmas Treasure
2016-01-08 03:15:05 -05:00
Shaun Bennett
d361ce948e
Merge branch 'develop' into william-gladiators
...
# Conflicts:
# Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilMath.java
2016-01-08 02:21:32 -05:00
Shaun Bennett
db7d814e02
Disable hub music
2016-01-08 01:42:05 -05:00
Shaun Bennett
19bb44cb9a
Disable HolidayManager and HolidayGiftManager
2016-01-08 01:41:02 -05:00
Shaun Bennett
9c3b07123f
Revert to normal HubType
2016-01-08 01:39:54 -05:00
Shaun Bennett
003af1b87c
Disable Holiday Words in DMT and Build
2016-01-08 01:38:49 -05:00
Shaun Bennett
b6b455c1c0
Merge pull request #117 in MIN/mineplex from clans/alpha to develop
...
* commit '15d2118bc1701b79576f6d73dc1d4aeca500f11e': (23 commits)
Added C.Mod rank, and started on rank info.
changed outpost forcefields to be a bit larger to surround the outpost more.
made outposts have a "forcefield" whilst they are being built. also made legendary announcements a different color as per Simon's request.
added server shutdown event, along with making the outposts cleanup on server shutdown to prevent debris of currently in-play outposts sticking around.
fixed npe on cleanup() because it doesn't check if the holograms are null or not. (they may or may not be null at the time of cleanup() being called depending on the current state of the outpost)
fixed outpost being built instantly on output block place.
holograms above outpost block should be centered in the block and made them despawn on outpost death
legendary pickkup message fix (FINALLY FIXED NOW )
quick modification to outposts, and fixed the legendary announcements being weird
updated clans version
quikc change
outpost changes, and some other things
lots of work on outposts, fixed gold dupe glitch, fixed clans ban gui title being "Customize New Gear".
fixes (?)
lots of changes that i can't remember at this point
Lots of changes, specifics: Fixed clans having more than max energy. Made /c home work from anywhere, 20 secs warmup, 30 secs in claimed territory. /c <clan> now works with clans with 18+ players.
player gold exploit checking. i know this code is strange but please don't delete it. we need it for now.
a couple more prettificatons to pvp timer messages.
one more quick message change/fix
qa changes to pvp safety
...
2016-01-08 00:35:15 -06:00
NewGarbo
15d2118bc1
Added C.Mod rank, and started on rank info.
2016-01-07 23:32:51 +00:00
Shaun Bennett
b606c8da22
More tutorial
2016-01-07 18:08:54 -05:00
NewGarbo
e1e8c2bb97
changed outpost forcefields to be a bit larger to surround the outpost more.
2016-01-07 21:02:55 +00:00
NewGarbo
43f075014a
made outposts have a "forcefield" whilst they are being built. also made legendary announcements a different color as per Simon's request.
2016-01-07 20:05:33 +00:00
Teddy
6bf0970dbe
Unused import removed
2016-01-07 19:52:04 +00:00
NewGarbo
fff6d8e03f
added server shutdown event, along with making the outposts cleanup on server shutdown to prevent debris of currently in-play outposts sticking around.
2016-01-07 19:36:52 +00:00
Keir
3be6030a5d
Exit if no identifier is supplied before any errors are caused.
2016-01-07 16:21:33 +00:00
Keir
21d8576787
Fix "bubbles" becoming detached from their icon.
2016-01-07 15:52:03 +00:00
NewGarbo
90a06d97b5
fixed npe on cleanup() because it doesn't check if the holograms are null or not. (they may or may not be null at the time of cleanup() being called depending on the current state of the outpost)
2016-01-07 14:04:26 +00:00
NewGarbo
d4fdda8ef2
fixed outpost being built instantly on output block place.
...
cleaned up a bit
2016-01-07 14:03:15 +00:00
NewGarbo
5c810a46c9
holograms above outpost block should be centered in the block and made them despawn on outpost death
2016-01-07 13:26:18 +00:00
NewGarbo
e9789b2ee8
legendary pickkup message fix (FINALLY FIXED NOW )
2016-01-07 10:31:23 +00:00
NewGarbo
d88b14d9d6
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-01-07 09:35:07 +00:00
NewGarbo
b685a207bc
quick modification to outposts, and fixed the legendary announcements being weird
2016-01-07 09:34:16 +00:00
Keir
644453a9c4
Name PubSub threads.
2016-01-07 07:06:55 +00:00
Keir
a63d98a2d7
Write to files asynchronously.
2016-01-07 07:04:24 +00:00
Keir
abc15e3a4c
Handle multiple multi-threaded Redis connections (and re-connections), improved logging, various refactors.
2016-01-07 06:58:21 +00:00
Keir
98a7b6d6d6
Allow data directory to be configured using a command-line parameter.
2016-01-07 04:40:39 +00:00
NewGarbo
ef929b39b3
updated clans version
2016-01-06 22:38:45 +00:00
NewGarbo
76c0230805
quikc change
2016-01-06 22:35:09 +00:00
NewGarbo
52c4a55180
outpost changes, and some other things
2016-01-06 22:32:36 +00:00
Thanos paravantis
dafd336526
Add water horror challenge idea, fix death effect hologram height.
2016-01-07 00:06:32 +02:00
libraryaddict
de6f6cf5f0
Add a IsLive check in Spleef
2016-01-07 08:49:26 +13:00
libraryaddict
c920d4efa1
Modify MapText to actually work, modify UtilText to save the images of characters
2016-01-07 04:48:44 +13:00
Thanos paravantis
71a0cd44a2
Format anti hack fix class.
2016-01-06 14:47:34 +02:00
Morten
82163e376b
Minor stuffs. Waiting for the build team to make us a chicken c:
2016-01-05 23:42:42 +01:00
Keir
63f8b3a74e
Keep files for 15 days instead of 1.
2016-01-05 22:33:07 +00:00
Teddy
99f0404fff
Queue speed up
2016-01-05 21:05:02 +00:00
Teddy
e2824dd0e0
Debugs removed
2016-01-05 21:01:51 +00:00
Teddy
d4fd6a6bf7
Treasure not giving Shards when dupes occur, fixed.
2016-01-05 21:00:43 +00:00
Thanos paravantis
101caf12ff
Hub: Hide stacker message when player clicks on an NPC. Display correct KOTH PvP Sword display name on player item drop.
2016-01-05 20:48:28 +02:00
Sarah
db2cddc443
Fixing Join/Quit messages
2016-01-05 19:10:40 +01:00
Teddy
d819671d16
Queue implemented for duplicate shard reward
2016-01-05 16:21:34 +00:00
Shaun Bennett
a73309fc11
Merge remote-tracking branch 'origin/develop' into develop
2016-01-04 18:14:10 -05:00
Shaun Bennett
f749300d48
Fix team stats not displaying properly
2016-01-04 18:13:54 -05:00
Shaun Bennett
10eb65a8d6
Merge pull request #114 in MIN/mineplex from bugfix/disguise-command to develop
...
* commit 'dd6d7b1b96947a400911bc5fa310039ab147c159':
updating denial message
Love you Sarah <3
Fixing Disguise File
update /Disguise for Hub as well
updating /disguise
2016-01-04 15:58:43 -06:00
Shaun Bennett
652084d071
Merge pull request #115 in MIN/mineplex from bugfix/thanos to develop
...
* commit '3770211e66b41e16440609a0a79b3999b9b6cca7':
Turf Wars: Include Teddy's border fix.
Turf Wars: Undo bracket formatting.
Turf Wars: Apply knockback on all players when there are only two in the match.
Turf Wars: Add comment on block physics event.
Turf Wars: Fix sneaking near turf edge and wool placement near ladders.
2016-01-04 15:56:32 -06:00
Shaun Bennett
962efe4a61
Fix not being able to join games through portals
2016-01-04 16:41:07 -05:00
Shaun Bennett
ed81411373
Fix carl bonus messages
2016-01-04 15:58:27 -05:00
Thanos paravantis
3770211e66
Turf Wars: Include Teddy's border fix.
2016-01-04 22:58:11 +02:00
Shaun Bennett
05ef4d30c7
Store a set of active members for objective goals
2016-01-04 15:56:33 -05:00
Morten
f24cc35ef8
Made some bugfixes and made a challenge harder
2016-01-04 21:13:12 +01:00
Thanos paravantis
982e684a45
Turf Wars: Undo bracket formatting.
2016-01-04 21:42:58 +02:00
Shaun Bennett
c50fb52a88
Disable New Years Countdown
2016-01-04 14:21:21 -05:00
Shaun Bennett
c739ecc26d
Fix forcefield for YOUTUBE_SMALL
2016-01-04 14:20:39 -05:00
Shaun Bennett
ce8586e5c5
More work and refactoring on the tutorial
2016-01-04 14:18:58 -05:00
Keir
7d16aeb84d
Cache private messages for chatsnap reports.
2016-01-04 18:04:47 +00:00
Keir
80c389faf4
Make private message event implement cancellable.
2016-01-04 17:59:16 +00:00
Thanos paravantis
47c78bcba1
Turf Wars: Apply knockback on all players when there are only two in the match.
2016-01-04 17:19:40 +02:00
Thanos paravantis
f6ce98f65b
Turf Wars: Add comment on block physics event.
2016-01-02 23:33:08 +02:00
Thanos paravantis
03c6395a30
Turf Wars: Fix sneaking near turf edge and wool placement near ladders.
2016-01-02 23:30:27 +02:00
AlexTheCoder
2b365e4afd
- Fixed blacklisting to stop join spam
2016-01-02 14:35:05 -05:00
Sarah
dd6d7b1b96
updating denial message
2016-01-02 16:45:15 +01:00
Thanos paravantis
5ac841dbf1
Merge branch 'master' into thanos-mineware
2016-01-02 16:34:30 +02:00
Thanos paravantis
a0d5a8229f
Change /restrict command, update death effect.
2016-01-02 16:33:21 +02:00
NewGarbo
b47665e115
lots of work on outposts,
...
fixed gold dupe glitch,
fixed clans ban gui title being "Customize New Gear".
2016-01-02 14:02:50 +00:00
Thanos paravantis
b3e2d67152
Change death effect skull and item spawn height, add /restrict <challenge> command.
2016-01-02 15:27:44 +02:00
Morten
7e1b0b9110
Love you Sarah <3
2016-01-02 03:19:39 +01:00
Sarah
a06a0060aa
Fixing Disguise File
2016-01-02 01:53:19 +01:00
Sarah
a30c2b0d75
update /Disguise for Hub as well
2016-01-02 00:53:56 +01:00
Thanos paravantis
c0a397b9fb
Add particles on death effect, started working on chicken attack.
2016-01-01 17:39:16 +02:00
Thanos paravantis
e89785963a
Change kit helmet to skull.
2016-01-01 15:35:45 +02:00
Thanos paravantis
bd63ff84e7
Add missing DeathEffectData and DeathText.
2016-01-01 15:30:16 +02:00
Thanos paravantis
49e3fabee5
Improve death effect, add death effect data and text.
2016-01-01 15:29:00 +02:00
Thanos paravantis
faa866fba1
Stable death effect version.
2016-01-01 01:35:05 +02:00
Shaun Bennett
2e017fa5ca
Fix redis command
2015-12-31 16:11:51 -06:00
Thanos paravantis
edb6318f31
Add rotating chicken head when a player dies on a challenge.
2015-12-31 23:27:15 +02:00
Shaun Bennett
8232d11cd1
Remove in game notifications, change sale message
2015-12-31 15:07:26 -06:00
Shaun Bennett
74eb04e5b4
Merge pull request #112 in MIN/mineplex from feature/new-year to develop
...
* commit '6b3a5416643389a7bcac8df93f40f492452971e5':
Accurate timings
Small edits
Flame
Made it activate in all lobbies via command.
Added a new years countdown to the hub.
2015-12-31 14:51:49 -06:00
William Burns
6b3a541664
Accurate timings
2015-12-31 18:53:57 +00:00
Thanos paravantis
287f782b82
Spawn eggs with velocity when a player dies.
2015-12-31 20:15:47 +02:00
Shaun Bennett
456b0dbeb7
Merge pull request #110 in MIN/mineplex from feature/MasterBuilder-Unban to develop
...
* commit 'f83016e0074ce810f727276a0feb127ecd69098f':
Also really quickly fixed the Invisibility in lobby bug (hopefully)
Removed a weird query :/
Finished up the Unban feature...
Added a feature to unban clients across the network But there still a bug when you type a username of a none registered member. Will fix ASAP - likely after Mineware
2015-12-31 11:27:08 -06:00
Sarah
8ef1a524c1
updating /disguise
2015-12-31 12:01:24 +01:00
Mysticate
efbd1c52d2
Merge remote-tracking branch 'origin/master' into feature/typewars-antimacrorekter
2015-12-31 03:01:23 -05:00
Mysticate
5ff9d1985b
Monitoring for josh + the mods
2015-12-31 03:00:40 -05:00
William Burns
637baed830
Small edits
2015-12-31 01:24:58 +00:00
William Burns
874695cdf6
Flame
2015-12-31 00:50:53 +00:00
William Burns
a64dc6a8d4
Made it activate in all lobbies via command.
2015-12-31 00:46:31 +00:00
Keir
3496abe227
Java 8 goodness.
2015-12-30 21:41:24 +00:00
William Burns
1b40cece80
Added a new years countdown to the hub.
2015-12-30 20:04:01 +00:00
libraryaddict
1a30e0b335
Latest changes to CB
2015-12-30 23:34:27 +13:00
AlexTheCoder
a4853e667c
- Gameplay edits and disabling broadcaster code
2015-12-30 03:23:21 -05:00
libraryaddict
92c4450eea
Update the dual version
2015-12-30 21:12:11 +13:00
Keir
2716039d07
Small cleanup.
2015-12-29 23:49:57 +00:00
Keir
5841ab1101
Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2015-12-29 23:47:00 +00:00
Keir
dffd7d95ec
Don't include sender in recipients.
2015-12-29 23:35:54 +00:00
William Burns
f1c7424939
Fixing hotbar
2015-12-29 15:19:09 +00:00
Shaun Bennett
55cdf4148a
Merge branch 'develop'
2015-12-29 03:21:03 -06:00
Shaun Bennett
16ee74885e
Add maintenance line
2015-12-29 02:52:53 -06:00
Shaun Bennett
7ad12d0a6b
Show Host Rank in private servers
2015-12-29 00:50:20 -06:00
Shaun Bennett
7104f1363a
Give YT rank access to extra preferences
2015-12-29 00:34:18 -06:00
Keir
00e92f2569
Change date time format, biggest -> lowest units.
2015-12-29 06:20:13 +00:00
Keir
16b3ad6c1c
Hovering over a reports age now shows the full date and time it was created.
2015-12-29 06:09:45 +00:00
Keir
738815bbb1
Show age of report instead of creation date and time for ease of use.
2015-12-29 05:51:50 +00:00
Keir
278932b9b8
Use CST timezone.
2015-12-29 05:23:18 +00:00
Keir
912b4aa4c8
Get Redis connection data from redis-servers.dat file.
2015-12-29 05:19:56 +00:00
fooify
fe337986bf
Merge remote-tracking branch 'origin/develop' into bugfix/foo
2015-12-28 16:16:10 -08:00
Virizion
8a8d5b088b
Switch to 7x7 builds.
2015-12-28 16:48:03 -05:00
Virizion
3d9a252868
Added auto pickup and fixed some stuff.
2015-12-27 15:26:43 -05:00
Virizion
162b3eb33f
Stopped a bunch of block events.
2015-12-27 14:34:24 -05:00
Thanos paravantis
a15f6f8473
Working on the new MineWare theme.
2015-12-26 22:33:54 +02:00
William Burns
1066becd68
push
2015-12-26 20:21:46 +00:00
Thanos paravantis
d5dd342af3
Start changing MineWare theme.
2015-12-26 14:45:54 +02:00
Thanos paravantis
317f5799fe
Fix classpath on mineplex core.
2015-12-26 12:54:47 +02:00
Thanos paravantis
499ad655c9
Merge branch 'MortensRawBugFixes' into thanos-mineware
...
Conflicts:
Plugins/Mineplex.Core/.classpath
2015-12-26 12:29:26 +02:00
Thanos paravantis
fcc1cd46a5
Make bouncing block red wool traps less strict when player walks on them.
2015-12-26 12:28:07 +02:00
Thanos paravantis
dcff689faf
Merge branch 'master' into thanos-mineware
...
Conflicts:
Plugins/Mineplex.Core/.classpath
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2015-12-26 11:55:57 +02:00
Virizion
845014b677
Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder
2015-12-25 15:49:41 -05:00
Shaun Bennett
c680d91b56
Nerf TypeWars gems (again)
2015-12-25 03:12:04 -06:00
Shaun Bennett
dd8e91e463
Update MOTD
2015-12-25 03:03:53 -06:00
Shaun Bennett
25d36b546a
Remove unnecessary files
2015-12-25 01:53:00 -06:00
Shaun Bennett
d08cfa0c4c
Holiday Gifts
2015-12-25 01:51:36 -06:00
Keir
fb24f4a1b0
Re-add ReportServer module (got removed somehow) and add it under the "Other" group.
2015-12-25 00:37:21 +00:00
Keir
56c5b8edee
Rename module to ReportServer.
2015-12-24 21:29:40 +00:00
Keir
2252a5397d
Fix file filter and reduce it down to 1 line.
2015-12-24 21:25:55 +00:00
Keir
cc421c1435
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2015-12-24 21:19:30 +00:00
Keir
42aba8bda1
Added file purger (runs every 30 minutes, purges anything older than a day).
...
Use a logger instead of sout.
General cleanup, especially of console messages.
2015-12-24 21:13:09 +00:00
fooify
41f56e9853
Lots of typo fixes and such
2015-12-24 11:13:54 -08:00
fooify
b356bce177
Merge remote-tracking branch 'origin/develop' into bugfix/foo
2015-12-24 11:09:08 -08:00
libraryaddict
2d974a781f
Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into Dual_1.9
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguisePlayer.java
Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-12-24 14:06:59 +13:00
Virizion
b0f8edb0f9
Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder
2015-12-23 18:25:52 -05:00
NewGarbo
aa50c4762f
fixes (?)
2015-12-23 18:55:44 +00:00
libraryaddict
1d4a5e5804
Clean up imports, set resource pack on clans.
2015-12-24 07:47:05 +13:00
libraryaddict
000b1f85b7
Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into develop
2015-12-24 07:41:55 +13:00
libraryaddict
67bdc6832f
Tentative beginnings for clans resource packs
2015-12-24 07:40:49 +13:00
NewGarbo
369687b5dd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
...
Conflicts:
Plugins/Mineplex.Game.Clans/.settings/org.eclipse.jdt.core.prefs
2015-12-23 18:31:51 +00:00
NewGarbo
ff24ebc9f4
lots of changes that i can't remember at this point
2015-12-23 18:22:20 +00:00
William Burns
79dea726aa
Added check for falling from map.
2015-12-23 10:59:12 +00:00
William Burns
c48df36459
Canvas reset with starting picture.
2015-12-23 10:26:14 +00:00
William Burns
ad1d444af8
Kit changes and new words.
2015-12-23 09:52:52 +00:00
William Burns
08b5e7b4db
Working loadouts.
2015-12-23 09:21:43 +00:00
Morten
f83016e007
Also really quickly fixed the Invisibility in lobby bug (hopefully)
2015-12-23 00:39:16 +01:00
Morten
8c399f03da
Removed a weird query :/
...
Status: Finished
2015-12-22 21:36:19 +01:00
Morten
9336eb19fa
Finished up the Unban feature...
2015-12-22 21:31:57 +01:00
fooify
0ac2158988
i before e!
2015-12-22 11:02:57 -08:00
fooify
255dd0bdb3
fixed cosmetic menu item dropping bug
2015-12-22 11:02:37 -08:00
fooify
592fcbd282
Merge remote-tracking branch 'origin/develop' into bugfix/foo
2015-12-22 10:55:11 -08:00
fooify
a8d9956846
more grammatical errors hast been fixed
2015-12-22 10:35:20 -08:00
Morten
14fd00a368
Bug fixes
2015-12-22 16:02:45 +01:00
Virizion
0322ae1217
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
2015-12-22 00:02:21 -05:00
William Burns
b255c58653
Merge branches 'develop' and 'william-gladiators' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators
2015-12-21 21:56:08 +00:00
Shaun Bennett
2ccd7a5de0
Fix Type Wars stat icon
2015-12-21 13:20:04 -05:00
Shaun Bennett
7a72762c78
Update MOTD
2015-12-21 12:56:37 -05:00
Shaun Bennett
c63014b51f
Type-Wars merge
2015-12-21 12:49:10 -05:00
Sarah
a5436d63c0
Updating Holiday Achievements
2015-12-21 18:45:26 +01:00
Sarah
7c66bdbbde
Updating Stats GUI
2015-12-21 18:25:44 +01:00
Sarah
010b1b0a5d
Achievements....
2015-12-21 18:08:11 +01:00
Sarah
6e3274ff2f
changing Category
2015-12-21 18:06:00 +01:00
Sarah
f15c318e5c
adding PM message.
2015-12-21 18:02:25 +01:00
Sarah
082b5e156c
fixing Kit NPEs
2015-12-21 17:48:17 +01:00
Sarah
ff5761cc1d
Fixing ending Stats.
2015-12-21 17:44:15 +01:00
Sarah
590da2128c
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java
2015-12-21 17:43:51 +01:00
Morten
1726aa2530
Added a feature to unban clients across the network
...
But there still a bug when you type a username of a none registered member.
Will fix ASAP - likely after Mineware
2015-12-21 12:58:19 +01:00
Shaun Bennett
5469289d82
Wrong iterator!
2015-12-21 06:57:56 -05:00
Shaun Bennett
fae2a5d2bf
Update game display
2015-12-21 04:40:30 -05:00
Shaun Bennett
a235103066
Merge pull request #106 in MIN/mineplex from update-menu to develop
...
* commit 'f4050fb1ff54dbe4639b0258eff53360d800d0b9':
Adjust GUI, fix beta button
Yo shaun debug this m8 ty
2015-12-21 03:36:46 -06:00
Shaun Bennett
f4050fb1ff
Adjust GUI, fix beta button
2015-12-21 04:35:57 -05:00
Shaun Bennett
99285b2ac8
Merge remote-tracking branch 'remotes/origin/type-wars' into develop
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java
2015-12-21 03:50:55 -05:00
Shaun Bennett
0da28faab8
Work on new tutorial
2015-12-21 03:49:27 -05:00
Mysticate
0f5be6444b
Yo shaun debug this m8 ty
2015-12-21 02:23:59 -05:00
Morten
c683ce5f0a
Improved minors bugs and implemented a more efficient Challenge rotation system
2015-12-20 21:08:32 +01:00
Sarah
816da0f633
Fixing Gems
2015-12-20 12:00:32 +01:00
fooify
fe658b30a1
Grammatical errors hath been fixed!
2015-12-19 15:03:42 -08:00
Morten
7c52b813f9
Merge branch 'MortensRawBugFixes' of http://184.154.0.242:7990/scm/min/mineplex into MortensRawBugFixes
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeBouncingBlock.java
2015-12-19 23:32:21 +01:00
Sarah
f1188529f2
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
2015-12-19 13:09:26 +01:00
Sarah
c56cd0d56e
adjusting some timings
2015-12-19 13:08:53 +01:00
Sarah
35966d88cf
Fixing Tutorial Minion
2015-12-19 13:05:39 +01:00
Sarah
7327d9463f
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
2015-12-19 13:00:49 +01:00
Sarah
8a54388480
fixing last commit
2015-12-19 13:00:12 +01:00
Sarah
32a0dd6668
adding Tutorial notification
2015-12-19 12:59:37 +01:00
Sarah
152e759c10
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
2015-12-19 12:56:05 +01:00
Sarah
7cb002ca86
Adding Tutorial notification
2015-12-19 12:55:28 +01:00
Sarah
f8bffc9f88
nuke delay and Stats
2015-12-19 12:45:06 +01:00
Virizion
c0ab31fdac
Finished up fixes.
2015-12-19 00:19:50 -05:00
AlexTheCoder
66c9fa122c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2015-12-18 21:33:59 -05:00
AlexTheCoder
09528a9262
- Initial broadcast stuff
2015-12-18 21:33:40 -05:00
Virizion
a5c18f4677
Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder
2015-12-18 20:05:03 -05:00
Sarah
b3afa0094e
Fixing some nuke stuff, Giant noises only for own Team and "Giant under attack message", spelling fixes
2015-12-19 00:59:15 +01:00
Sarah
dab2416ccd
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
2015-12-19 00:49:16 +01:00
Sarah
6c5e3d7509
Fixing visibility.
2015-12-19 00:48:42 +01:00
Thanos paravantis
3128e9766f
Remove arrow trail from arrow rampage challenge.
2015-12-18 21:55:44 +02:00
William Burns
c2e88c2794
Merge branch 'develop' of ssh://184.154.0.242:25565/min/mineplex into feature/player-data
2015-12-18 18:16:32 +00:00
William Burns
13cfc0e12a
Updated to a better check
2015-12-18 18:16:20 +00:00
Keir
a72125b1dc
Implement new error thingy.
2015-12-18 18:11:25 +00:00
William Burns
0e0a22ab15
Error page
2015-12-18 17:56:22 +00:00
Keir
0b4568e785
Commit progress.
2015-12-18 17:41:03 +00:00
Keir
77595c8fbc
Allow search form to be loaded when no identifier is supplied (error messages are a bit crappy atm I'm aware).
2015-12-18 16:20:57 +00:00
Keir
bd887e1eef
Make search box functional.
2015-12-18 15:52:20 +00:00
William Burns
f57304764c
Added a hotbar layout editor
2015-12-18 15:16:00 +00:00
