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
cdef447b7f
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/logitech-brand
2016-05-02 16:28:26 -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
Conrad
0a340d1789
Merge pull request #46 from Mineplex-LLC/feature/logitech-brand
...
Branding Billboard System
2016-05-01 19:58:56 -04: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
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
Keir Nellyer
6e545c902a
Use all-man style braces here to be compliant with the coding standards
...
(cherry picked from commit e553ac5
)
2016-05-01 16:55:11 +01: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
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
01bc9e9e6b
Merge pull request #44 from Mineplex-LLC/revert-24-feature/report
...
Revert "Report system (version 1)"
2016-04-30 14:55:14 -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