e1f2bb9740
Use all-man style braces here to be compliant with the coding standards
...
(cherry picked from commit e553ac5
2016-05-04 16:02:39 +01:00
a663cb3e01
Revert "Revert "Report system (version 1)""
...
This reverts commit d0d2de1e21
2016-05-04 15:24:29 +01:00
d7d00e1614
Merge pull request #52 from Mineplex-LLC/alex-mcl
...
Add a method for simply checking if a player has been participating i…
2016-05-04 09:30:00 -04:00
0e509898ec
Add a method for simply checking if a player has been participating in the current game, and implement it in the ranked bans system
2016-05-03 21:07:50 -04:00
145ea9221a
Merge pull request #40 from Mineplex-LLC/clans/beta
...
Clans/beta
2016-05-03 16:57:07 -04:00
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
3c482e38cc
Merge pull request #47 from Mineplex-LLC/feature/logitech-brand
...
Convert over to System.out.println() for error messaging and add prot…
2016-05-02 16:34:58 -04:00
2cd76fbf72
Merge pull request #48 from Mineplex-LLC/alex-mcl
...
Add catch for rare occurrence where players have no stored data
2016-05-02 16:34:50 -04:00
3d98c08a67
Add in missing file
2016-05-02 16:33:11 -04:00
ccd5b47d75
Convert over to System.out.println() for error messaging and add protection for billboards in Hub via a new manager
2016-05-02 16:20:41 -04:00
cd2bd8ac1d
Fix the TNT Cannon in the tutorial not exploding correctly when fired at the enemy base's doors, as that would cause the tnt entity to just slightly be out of the wall bound and that made the tutorial think that the player missed the wall, making that part of the tutorial near-impossible to pass unless known where to fire exactly. Along with this I also made the cannon rotation lock to a specific range so that people can't miss. Ever.
2016-05-02 11:49:56 +01:00
8a1b5572a8
Fix players in tutorial receiving messages from the real game whenever the message sender is not in a clan.
2016-05-02 10:31:45 +01:00
026ab15099
Fix multiple leaving messages being broadcasted to the server when a player is kicked from the server after getting cbanned.
2016-05-01 23:20:55 +01:00
1e18707fd7
Include the missing PlayerMessageEvent, as I had also forgotten to add documentation about the class.
2016-05-01 23:06:30 +01:00
480cc0f9be
Fix NullPointerException when a player leaves the server without their Clans Ban client being loaded into memory beforehand.
2016-05-01 23:04:30 +01:00
e139bea465
Fix kill messages inserting a space below them in chat.
2016-05-01 23:03:18 +01:00
7e97bd346e
Change an internal method to private and add missing class JavaDoc
2016-05-01 15:16:42 -04:00
335c5a4510
Clean up billboard generation and clearing, rewrite MapRender for logos, and add JavaDocs to comply with code standard
2016-05-01 14:58:40 -04:00
eae972a3e6
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-05-01 10:11:28 +01:00
9d97ea8d1e
Missing Clans ban cache class (to do with the commit previously by me)
2016-05-01 10:11:17 +01:00
4cffb39941
Delay dismount teleport by one tick
...
This mitigates a stack overflow caused by a teleport before a dismount
event processes fully.
2016-05-01 01:30:42 -05:00
48c8a5a630
Force structure to spawn correctly, complete with maps on item frames
2016-05-01 01:56:07 -04:00
189f9ad524
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
2016-05-01 01:42:32 +01:00
2337e89a93
Improvements to the Clans ban system in general as it was performing more operations than required, and accessing the database more than was necessary. Polished up the Clans ban GUI as well.
2016-05-01 01:42:11 +01:00
8ca38b2598
Prepend http:// to resource pack locations
2016-04-30 18:54:17 -05:00
070326e72d
Create systems to automatically create and destroy branding boards, as well as implement the Logitech branding
2016-04-30 19:26:16 -04:00
10166f063b
Merge branch 'develop' into clans/beta
2016-04-30 16:16:57 -05:00
14204fba5c
Changed resource packs to home hosted ones
2016-04-30 16:02:26 -05:00
890ab9f67e
Uncommented ClansBanManager's instances
2016-04-30 16:02:26 -05:00
f1c2e71d56
Some changes to error handlng for clans regions
2016-04-30 16:02:26 -05:00
634a34dd52
Reintroduce non-Air constraint to cannon explosion
2016-04-30 16:02:26 -05:00
2eb7b892e0
Refactor cannon explosion effect for clarity
2016-04-30 16:02:26 -05:00
f2f627116a
Correctly count cannon explosion effect attempts
...
Previously, cannon explosions effects could lock up the main thread if:
- The effect location selection RNG was sufficiently unlucky
- The explosion occured sufficiently deep into a larger claimed
territory
2016-04-30 16:02:26 -05:00
39c105f0cf
Add catch for rare occurrence where players have no stored data
2016-04-30 15:34:04 -04:00
d0d2de1e21
Revert "Report system (version 1)"
2016-04-30 14:53:59 -04:00
e0e30a8b7f
Merge pull request #43 from Mineplex-LLC/alex-mcl
...
Fix Async Elo Ranked Bans
2016-04-30 14:46:49 -04:00
37a815d52a
Update JavaDocs to fit Mineplex standard
2016-04-30 14:41:28 -04:00
2e4bae6915
Merge branch 'feature/top-elo' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla
2016-04-30 14:14:14 -04:00
2dc5c46624
Fix naming convention on checkRankBannedAsync
2016-04-30 14:13:21 -04:00
41e26f283c
Fix all async elo ranked ban methods and switch to callback system for API hooks
2016-04-30 14:10:09 -04:00
6e35bc0989
Stop spamming the chat.
2016-04-30 00:55:59 -05:00
2490e3df82
Previous git merge cause this single line to be deleted
...
I literally have no idea why or how this happened.
2016-04-29 23:47:01 +01:00
6a00f26d5f
Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
# Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-04-29 23:42:27 +01:00
81cebc4ce7
Swap static helpers for a much better solution
...
This allows for easier refactoring in the future when we move away
from retrieving the CoreClientManager from a static instance.
Mineplex coding standards are also against the use of static helpers
in scenarios such as this, therefore this commit brings this branch
to be in-line with the coding standards.
2016-04-29 23:37:40 +01:00
f63a872bd4
Changed resource packs to home hosted ones
2016-04-29 14:46:14 +10:00
a8d9745320
- Fixed order of Top Elo
2016-04-29 00:12:25 -04:00
c814fc73f7
Uncommented ClansBanManager's instances
2016-04-29 12:53:20 +10:00
26f6a1189f
Prettyfy EloCommand
2016-04-28 21:34:43 -05:00
e83e4b270c
Prettyfy EloCommand
2016-04-28 21:34:07 -05:00
00efb7d72e
Fix ELO query
2016-04-28 21:20:48 -05:00
Keir Nellyer
Conrad
AlexTheCoder
cnr
Ben
phobia
TadahTech