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

43 Commits

Author SHA1 Message Date
Jonathan Williams
3a47a161c5 Enabled snake parkour 
Updated servermanager/serverNpcPage to handle free and beta timers.
 2014-08-22 22:53:15 -05:00
Jonathan Williams
70217fe957 Finished first release of Customer Support plugin. 2014-08-22 10:47:46 -05:00
Jonathan Williams
9ee25c6292 Did some cleanup in Pvp project. 
Did work in Coreclient manager and added StaffServer (still in progress)
 2014-08-19 21:36:23 -04:00
Ty
36d6a58e0a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/GroupStatusData.java
	Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java
 2014-08-11 15:39:56 -04:00
Jonathan Williams
0cdfda7765 Fixed message on free timer. 2014-08-09 08:08:24 -05:00
Jonathan Williams
0de8d22e62 Changed invis in hub to only be on server npc shops 
Fixed /a for senior mods and developers.
 2014-08-09 00:06:44 -05:00
Ty
1b7c762942 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancer.java
	Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/lobbyBalancer/LobbyBalancerRepository.java
	Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/GroupStatusData.java
	Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/Repository.java
	Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerGroupData.java
	Plugins/Mineplex.ServerMonitor/src/mineplex/servermonitor/ServerMonitor.java
 2014-08-04 18:47:49 -04:00
Shaun Bennett
69b709b3ab Change clock timer to be 35 seconds 2014-08-03 13:28:56 -05:00
Shaun Bennett
db61a10c7f Remove server split from server selection pages 
Select any server with portals
 2014-08-03 13:24:13 -05:00
Jonathan Williams
51faf5cd15 Reduced free timer. 2014-08-02 03:01:36 -07:00
Ty
6a9255e97b Add new Mineplex.ServerData library for interfacing with the ServerRepository, and modify Mineplex.ServerMonitor, Mineplex.Bungee.Mineplexer and Mineplex.Core to integrate changes. 2014-08-01 17:56:29 -04:00
Jonathan Williams
b056733ba1 Removed duration code and replaced with 60000L 2014-08-01 00:09:35 -07:00
Jonathan Williams
53ce70488f Merge pull request #1 from premium-server-menu to master 
* commit '95a45409a98c141a115e463e56e440b204ae2029':
  Use UtilPlayer and F.main for messaging
  Fix flashing clock (oops!)
  Sound effects and knockbacks!
  Flashing wool instead of clock for the timer
  Change duration of timer. Don't punish a party if the leader has ultra
  Lighten load on our servers, not free servers!
  Lore edit on clock item
  Place players on correct server corresponding to their rank via portals
  Visual clock update
  Fix lore messages not displaying correctly under certain circumstances
  Use constants for lore messages on server page
  Prevent free players from joining servers before time limit
  Deny joining Premium servers through server command without premium
  Fix "Click to Spectate" formatting
  Identify free servers from server name
  Add Server Menu for Premium Servers. Item lore still needs some work
 2014-08-01 02:05:39 -05:00
Shaun Bennett
95a45409a9 Use UtilPlayer and F.main for messaging 2014-08-01 01:43:50 -05:00
Jonathan Williams
eae4bed630 Removed unused ServerManagerUpdater.java 
Tweaked ServerMonitor to handle Free/Premium
 2014-07-31 23:37:39 -07:00
Shaun Bennett
fbe6ab2fdb Sound effects and knockbacks! 2014-08-01 01:22:01 -05:00
Shaun Bennett
6b18fdf396 Change duration of timer. Don't punish a party if the leader has ultra 2014-08-01 00:38:26 -05:00
Shaun Bennett
c01e9abf29 Place players on correct server corresponding to their rank via portals 2014-07-31 23:56:51 -05:00
Shaun Bennett
4c74ce60eb Prevent free players from joining servers before time limit 2014-07-31 15:36:00 -05:00
Jonathan Williams
04236939d6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-14 21:27:42 -07:00
Jonathan Williams
264248ecfa Added castle siege quick join menu button. 2014-06-14 21:27:21 -07:00
Chiss
1bfa24cc45 Fixed Fireworks crash bug & portal destroy bug; 
-Only livingentities bounce off portals
-Fireworks cannot be used near portals
 2014-06-15 12:35:09 +10:00
Jonathan Williams
4fca244812 Made ItemGadgets Free. 
Removed queue dom shop.
 2014-06-10 02:00:53 -05:00
Jonathan Williams
d5ea6c5377 Removed dead project ServerStatus 
Tweaked connection strings so they autoreconnect.

Added dragon sound to pre-queue prompt.

Added rest of missing files.
 2014-05-28 11:18:30 -07:00
Jonathan Williams
0634ee5543 Removed unused global stuff in Mineplexer. 
Did some edits in GroupManager...need to pick that up.

Changed TimeUtil to pop last entry when stopping.
Fixed WorldUtil's dimension thing for UHC.
Fixed Exception with AntihackRepository and no static lock object on _connection

Work on Elo manager.
Work on Queue.

Added checking for player to server transfer records.

Added option for rejoin time in TeamGame (UHC...yay)
 2014-05-27 02:10:29 -07:00
Jonathan Williams
7637d94ae0 Added mysql logger. 
Hooked it up in a few places.

Fixed Asynch crap with AntiHack.
 2014-04-30 00:31:22 -07:00
Chiss
26fe974b00 More CHamps 2014-04-03 15:48:58 +11:00
Jonathan Williams
f0b347f97f Changed beta testing to Ultra and up. 
Did some work on DOM 2.0
 2014-03-05 00:34:20 -08:00
Jonathan Williams
d99a3c9253 Optimized mysql queries with server status' address/updated fields. 
Removed double gems.
Added BETA check for Hero only beta games.
 2014-03-03 12:47:57 -08:00
Jonathan Williams
e55885c85d itsy 2013-12-18 05:22:40 -05:00
Jonathan Williams
ae779d063e Added quick menu buttons for Block Hunt and Survival Games 2013-11-23 02:04:22 -08:00
Jonathan Williams
0aee445e00 Added timeout check for status retrieval 2013-10-26 16:36:48 -05:00
Chiss
723b57cd46 Added paintball gun Gadget 
Added bat blaster Gadget

Halloween Game near-completed

Added SSM Witch
 2013-10-26 19:01:26 +11:00
Jonathan Williams
1431961b39 Fixed issues with Pet menu. 
Fixed typo in Welcome Tutorial
 2013-10-05 00:59:45 -07:00
Jonathan Williams
57b0d06786 Added DisguiseWolf 
Added lobby menu (disabled autogive for testing)
Removed unused commands.
 2013-10-02 22:23:01 -07:00
Jonathan Williams
44da981cf4 Fixed dominate bug again. 
Fixed quick game menu bug.
 2013-09-27 23:06:53 -07:00
Jonathan Williams
b6d33010ca - Lava parkour fire ticks are no more 
- Lava gem rewards on npcs reflect actual value (1000 and 4000)
- Can't carry people into parkour areas now

Removed unused code with Portal
Added portal functionality for server quick join
Disabled SG text
Updated quick game menu text.
 2013-09-27 12:40:09 -07:00
Jonathan Williams
7329cc0aea Implemented quick game menu. 
Fixed dom team size at 1.

Removed old server update code from server manager.
 2013-09-18 22:11:49 -07:00
Jonathan Williams
f31a734a0d Fixed server pages to show 5 servers. 
Added in creeper explode block list for UHC.java
Added task assignment/reward message only on return confirm call.
Hide players in hub when they have an inventory open.
Added gem command into donation manager.

Revamped bungee player count method.
Revamped server status method.
 2013-09-17 15:50:23 -07:00
Jonathan Williams
c976a46f1f Optimized UtilText/MapUtil.java 
Added quick game menu.  Still needs work.
 2013-09-13 15:25:01 -07:00
Jonathan Williams
d6bd962768 Added in dynamic servermanager updating. 
Added updating of bungeeServers/servers list.
Combined all bungee plugins to Mineplexer

Fixed arcade bug on player quit.
Fixed ServersUI page errors.
 2013-09-11 13:53:24 -07:00
Jonathan Williams
d4b3c5d461 Fixed memory leaks. 
Added in party joining for servers in Hub
Modified server status's in server UI.
 2013-09-09 01:28:35 -07:00
Jonathan Williams
3fb52c5c71 Initial Commit 2013-08-27 08:14:08 -07:00