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

114 Commits

Author SHA1 Message Date
Jonathan Williams
8883855297 Added witch disguise 
Added missing files.
 2013-10-25 19:05:26 -05:00
Chiss
e8ddfc266e fsd6gty72 tjn6g wgh 2013-10-25 22:20:46 +11:00
Jonathan Williams
e5f99331dd Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-25 05:16:15 -05:00
Chiss
5563d94111 Halloween event update 
hub News
hub mounts
hub gadgets
 2013-10-25 19:20:14 +11:00
Jonathan Williams
21128eb153 Prepping filterChat and CoreClientManager for mysql 
Removed get all clients at server start.
 2013-10-23 16:36:13 -05:00
Chiss
1977572ced Added Halloween Minigame 
Updated gadgets and other minor things.
 2013-10-22 15:46:31 +11:00
Jonathan Williams
985ce795d2 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-18 00:50:49 -07:00
Jonathan Williams
90fbc397ff Converted gem rewards to boolean return from website. 
Implemented gem transactions and source.
 2013-10-18 00:46:06 -07:00
Chiss
02258b9fd3 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-18 09:12:19 +11:00
Chiss
882ede9a21 tp ah exception 2013-10-18 09:09:29 +11:00
Jonathan Williams
7e77f78d2f Removed all client list pull. 2013-10-17 00:54:14 -07:00
Jonathan Williams
43b42f771a Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java
 2013-10-17 00:40:06 -07:00
Jonathan Williams
f88c202e07 Added AntiHack to Arcade/Hub 
Added AntiHack Offense uploading.
Fixed memory leaks in PreparedStatments
Added Ultra tag in hub chat.
 2013-10-17 00:37:57 -07:00
Chiss
410e08b06a Clearer MAC reporting to staff 2013-10-17 09:05:03 +11:00
Chiss
4d6a0e2133 Ah no kick 2013-10-17 09:02:52 +11:00
Chiss
d9ecbf4037 AH Update 2013-10-17 09:01:36 +11:00
Chiss
d23f72567a fixed bug. 2013-10-16 17:22:28 +11:00
Chiss
9cdcbed086 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-16 12:24:02 +11:00
Chiss
2a836f3464 Added anti-hack 2013-10-16 12:23:23 +11:00
Jonathan Williams
483f8ffde3 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-10-15 14:20:45 -07:00
Jonathan Williams
1a5f6a9b74 Coreclient fix. 2013-10-15 14:18:13 -07:00
Chiss
40e49dd3d4 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-16 08:11:04 +11:00
Chiss
ec80d8a568 added AntiHack 
added dragonrider coolness
 2013-10-16 08:10:45 +11:00
Jonathan Williams
c68bfce21a Fix for null pointer in core client cleanup 2013-10-14 12:20:49 -07:00
Jonathan Williams
922d269a52 Added core client cleanup in case of weird glitch from bungee 2013-10-13 22:40:06 -07:00
Jonathan Williams
6c568cb7a9 Added MemoryFix to Arcade 
Added Dipose override and task cancellation to Confirmationpage
Cleaned up unused code in Updater
 2013-10-13 21:51:25 -07:00
Chiss
230ad4aa7b Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-10-14 10:29:48 +11:00
Chiss
9ffc793f61 added Dragon Rider 
anti-stack changes (dont anti-stack mined blocks)
 2013-10-14 10:29:20 +11:00
Jonathan Williams
1c1fb056a6 Memory leak fix for explosion blocks. 2013-10-13 01:27:41 -07:00
Chiss
a34b6da238 even less blocks 2013-10-13 09:20:00 +11:00
Chiss
bb39f18573 Explosion creates less blocks. 2013-10-13 09:18:49 +11:00
Jonathan Williams
e723075298 Increased lobby menu size. 
Fixed memory leak in Explosion
 2013-10-12 02:52:35 -07:00
Jonathan Williams
42b932e612 Added inventory move prevention for all inventories 
Prevent bone from being turned into bonemeal and being fed to pet wolf.
Fixed Dominate shop in hub.
 2013-10-12 01:55:32 -07:00
Jonathan Williams
f2c295c391 Fixed global ultra joining full games. 2013-10-11 22:03:17 -07:00
Jonathan Williams
fc18d0fbb1 Added null check logging to arcade custom kit name. 
Removed wolf kit in SSM for release
Cleaned up PlayerAccountController
Fixed connection leak for mysql connections.
Added server shutdown if server is empty for dominate.
 2013-10-10 09:01:48 -07:00
Jonathan Williams
3999f80a79 Fixed Lobby balancer issue and null bungee connect. 
Optimized lobby balancing based on connects per second.

Added Pet deactivation.

Possibly fixed asynchronous pet spawning as well.
TODO : Realized we are doing a lot of async stuff....stupid jon jon.
 2013-10-08 02:22:04 -07:00
Jonathan Williams
1431961b39 Fixed issues with Pet menu. 
Fixed typo in Welcome Tutorial
 2013-10-05 00:59:45 -07:00
Jonathan Williams
f389378bd2 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 2013-10-04 23:57:58 -07:00
Jonathan Williams
4ed1d97a33 Added missing pet buttons. 2013-10-04 23:56:16 -07:00
Jonathan Williams
59d7a78086 Revamped pet purchase and added pet menu to player hotbar. 
Fixed ServerStatusManager still firing errors if IgnoreUpdates was in.
 2013-10-04 23:55:05 -07:00
Chiss
ab45c717dd Merge branch 'master' of ssh://198.245.50.91:7999/min/master 2013-10-05 07:49:21 +10:00
Chiss
3ba848567c paintball added 
hg additions
minor changes to other games
 2013-10-05 07:49:05 +10: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
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
b71ff09fb5 Fixed double server status manager in MK 
Fixed tps of 0.
Fixed couple bugs in Shop/Conf page.
 2013-09-26 21:18:31 -07:00
Chiss
064dd97d00 HitBox support for disguises 
Squid hitbox added
Changed squid swimming!
 2013-09-24 08:56:09 +10:00
Jonathan Williams
68e068092f Fix for ageable. 2013-09-23 15:09:52 -07:00
Jonathan Williams
6d5acd29db Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master 
Conflicts:
	Plugins/Libraries/craftbukkit.jar
 2013-09-23 13:53:28 -07:00
Jonathan Williams
10994924c2 Fixes for Bungee lobby balancer. 
Exception handling in PlayerJoinEvents for hub (tracking a bug)
Fix in pages for shop.
Support eth1 private address setting in server status.

Fix for bug in ClientClass.
 2013-09-23 13:30:40 -07:00
Chiss
eae38dfa22 Merge branch 'master' of ssh://198.245.50.91:7999/min/master 
Conflicts:
	Plugins/Libraries/craftbukkit.jar
 2013-09-23 15:50:30 +10:00