JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,472 Commits 1 Branch 0 Tags 481 MiB
Commit Graph

7472 Commits

Author SHA1 Message Date
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
phobia a67fec95fc Remove ultra tag 2016-05-15 03:21:58 -05:00
samczsun b2e92fdf15 Don't pass on INTERACT_AT as INTERACT. Fixes PC-114 2016-05-14 09:42:28 -05:00
AlexTheCoder fab24e2139 Allow admins to be opped on testing servers 2016-05-12 17:24:37 -04:00
Sam Sun 2ae072f5b7 Rename modules to correct name 2016-05-12 11:44:35 -04: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
Conrad 8eba2c9ccb Merge pull request #59 from Mineplex-LLC/feature/logitech-brand 
Move billboard up 1
 2016-05-09 11:55:22 -04:00
Conrad 5ecf197f20 Merge pull request #58 from Mineplex-LLC/update/emergency-disable-report 
Disable report system as it is not ready to go live
 2016-05-09 11:35:30 -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
Conrad 39c3833b47 Merge pull request #57 from Mineplex-LLC/clans/beta 
Latest clans/beta changes
 2016-05-08 18:08:50 -04:00
cnr 4aa44cd796 Merge branch 'develop' into clans/beta 2016-05-08 16:53:48 -05:00
Conrad a1780eff74 Merge pull request #56 from Mineplex-LLC/feature/report 
Implement Reporting system (version 1)
 2016-05-08 17:49:11 -04: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
phobia 38f22b1577 Disable obsidian dropping after breaking THE BLOCK 2016-05-07 19:51:19 +10:00
Conrad c0c5b3e284 Merge pull request #54 from Mineplex-LLC/update/rank-colors 
Change LT, Owner, Developer, Admin to DARK_RED
 2016-05-06 09:48:31 -04:00
Shaun Bennett 60dce9ef1b Change LT, Owner, Developer, Admin to DARK_RED 2016-05-06 13:43:30 +10: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
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.

# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
 2016-05-04 15:24:29 +01:00
Keir Nellyer b68aea00c6 Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
 2016-05-04 15:10:43 +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
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
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
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
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
Conrad 0a340d1789 Merge pull request #46 from Mineplex-LLC/feature/logitech-brand 
Branding Billboard System
 2016-05-01 19:58:56 -04: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
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