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

802 Commits

Author SHA1 Message Date
Shaun Bennett
155d8bff1b Fix cannon angles 2016-01-26 13:36:30 -06:00
NewGarbo
63f9622876 cannon correctly loadded title + fixed rotation being all wrong 2016-01-26 17:51:29 +00:00
NewGarbo
7c85fe62ca charred blocks updates 2016-01-26 17:36:12 +00:00
NewGarbo
2445e73623 better cannon crater particles 2016-01-26 13:06:47 +00:00
NewGarbo
3b18b93286 fixed top right slot in cannon not counting as an empty slot. 2016-01-26 09:26:51 +00:00
NewGarbo
467af4b835 Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta 2016-01-26 09:24:53 +00:00
NewGarbo
e68dea65e1 stop dispensers being used for flint-andsteal, bonemeal etc etc 2016-01-25 17:46:39 +00:00
NewGarbo
18e892c4ec finally fixed that windblade dupe 2016-01-25 17:41:07 +00:00
NewGarbo
71bb1ed3d6 this is just really slowing down startup time by A LOT 2016-01-25 17:22:56 +00:00
NewGarbo
9d77632fcc allow clans moderators to use /cb 2016-01-25 17:18:00 +00:00
NewGarbo
2bf2050844 increased sapling cooldown to 20 minutes from one second. 2016-01-25 17:13:53 +00:00
NewGarbo
7f1c74ced5 bumped version up to 0.19 2016-01-25 17:11:08 +00:00
NewGarbo
2b70daf8df allowed clans mods to use /cban 2016-01-25 17:02:49 +00:00
NewGarbo
5a5dc9925e set spawning rate of charred blocks a 10% lower 2016-01-25 17:02:26 +00:00
NewGarbo
208df93739 fixed fire particles not showing up in craters 2016-01-25 17:02:02 +00:00
NewGarbo
ce36cf79bf added a tnt limit, set to 1 as it makes gameplay better 2016-01-25 17:01:46 +00:00
NewGarbo
9b88683fdc fix cannon tnt exploding prematurely, added cooldown rather than using Recharge. 2016-01-25 17:00:38 +00:00
NewGarbo
fde5a5af28 Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta 2016-01-25 08:47:08 +00:00
NewGarbo
d82a7b353f allow C.Mods to join all server regardless of home servers 2016-01-25 08:42:38 +00:00
NewGarbo
54fa1449f6 cannon crater changes 2016-01-25 08:40:59 +00:00
NewGarbo
c43c09fd3c the cannons shouldn't explode instantly! also added fire effects to craters + clan tips when hopping on a cannon 2016-01-24 21:45:46 +00:00
NewGarbo
0252436990 cannons updates 2016-01-24 20:56:47 +00:00
NewGarbo
a41521d6a9 Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/safelog/SafeLog.java
 2016-01-23 13:42:25 +00:00
NewGarbo
1f7e1fb6cf fix dupe bug and safelog 2016-01-23 13:40:49 +00:00
NewGarbo
24011c4af4 cannons work 2016-01-23 12:46:52 +00:00
NewGarbo
bf6f1a1701 sapling stuff messed up oops 2016-01-22 15:28:12 +00:00
NewGarbo
090b6e496a sapling stuff messed up oops 2016-01-22 15:27:44 +00:00
NewGarbo
c524247777 supplies command for sieges 2016-01-22 15:27:10 +00:00
NewGarbo
6638562866 npe fix 2016-01-22 15:21:20 +00:00
NewGarbo
f25c7b0277 don't need that + npe fix 2016-01-22 15:19:32 +00:00
NewGarbo
b869d4a7a8 Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta 2016-01-22 15:16:20 +00:00
NewGarbo
c4bbeb2535 more control over saplings 2016-01-22 14:55:50 +00:00
NewGarbo
a377a09925 fixed wind blade dupe bug 2016-01-22 11:22:20 +00:00
NewGarbo
cc48d98208 pushing to beta to change to alpha 2016-01-22 11:06:19 +00:00
Shaun Bennett
359655f417 Merge pull request #131 in MIN/mineplex from md_5/suspicious to develop 
* commit '4927bb8c0b6b1fcebe41adf9f38489fe82116cfa':
  Fix some misc suspicious calls to Collection methods.
 2016-01-20 12:23:55 -06:00
md_5
bb4091c7a6 Use Maven for Compilation 2016-01-20 11:20:58 +11:00
md_5
4927bb8c0b Fix some misc suspicious calls to Collection methods. 2016-01-17 20:20:48 +11:00
NewGarbo
40c52ac557 made it so that cannons don't rely on outposts. this should help with testing them without needing an outpost 2016-01-16 08:25:30 +00:00
NewGarbo
254a2e45e4 comments + cannons state enum rename 2016-01-16 08:22:35 +00:00
NewGarbo
e71a2d2e48 quick npe fix 2016-01-16 08:20:11 +00:00
NewGarbo
1042edb134 CANNONZ! 2016-01-16 08:18:06 +00:00
NewGarbo
1faeb43b73 fixed iron block sometimes sticking around after placing cannon 2016-01-15 07:17:51 +00:00
NewGarbo
a554f1b7c6 needed to update some code with the cannon item location changing. also removed unused imports. 2016-01-15 07:00:39 +00:00
NewGarbo
f78c469875 moved cannon item to Cannon.java to be consistent with the outpost item being in Outpost.java 2016-01-15 06:59:18 +00:00
NewGarbo
e0b7be0813 made /meow give you 64 cannons and 64 outposts 2016-01-15 06:58:20 +00:00
NewGarbo
70444ff508 cannon + siege work with outposts, also moved outposts to the clans.siege package 2016-01-15 06:53:58 +00:00
NewGarbo
595ab0d763 siege work 2016-01-14 09:46:12 +00:00
NewGarbo
fb53e443e7 cleanup and cannons stuff 2016-01-12 20:27:24 +00:00
NewGarbo
f3003e795e Implemented Outpost MK III 2016-01-12 18:59:01 +00:00
NewGarbo
6cde84ec5f fixed outpost block placing/breaking boundary checking 2016-01-12 18:57:25 +00:00
NewGarbo
025f82e5ed made the forcefield bump much weaker 2016-01-12 16:31:21 +00:00
NewGarbo
62f16ada81 that's not the correct bounds! 2016-01-12 07:57:35 +00:00
NewGarbo
5b4b5fb2b5 fixed outpost forcefield knocking you away even if the building is complete, also made the particles show the actual boundaries 2016-01-12 07:44:20 +00:00
NewGarbo
7d858c72f3 Merge branch 'clans/beta' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta 2016-01-12 07:12:18 +00:00
NewGarbo
a6be919e4a agh lost some code ;-; 2016-01-12 07:10:22 +00:00
NewGarbo
ed8d9459b2 goes with the commit below VVVV 2016-01-12 07:02:19 +00:00
NewGarbo
d3452772ed outposts work (grr git is weird trying to switch over to clans/beta) 2016-01-12 07:02:03 +00:00
NewGarbo
c873b6b886 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 2016-01-12 06:58:53 +00:00
NewGarbo
d656c7a212 fixed clans banned players counting as being online after joining and their territory then being blown up 2016-01-11 18:02:03 +00:00
NewGarbo
3773ab3f0b fixed safelog npcs sticking around some time 2016-01-11 10:14:32 +00:00
NewGarbo
60a78e396f remove legendary announcement in chat/middle text 2016-01-11 09:16:11 +00:00
NewGarbo
d5b5ac7bb0 changed regen level on giants broadsword from 4 to 3 and made slowness last longer so that screen doesn't glitch out 2016-01-10 23:06:39 +00:00
NewGarbo
d4ccb82791 didn't push this earlier 2016-01-10 23:03:16 +00:00
NewGarbo
6673081fb3 fixed LeechingAttribute from throwing an error when setting health above 20 2016-01-10 22:31:51 +00:00
NewGarbo
bccee71ff7 made signs placed by muted players get cleared on being placed 2016-01-10 21:16:49 +00:00
NewGarbo
734351011a made all old clans ban clients get unloaded. there seems to have been problems with certain clients not unloading. 2016-01-10 21:15:50 +00:00
NewGarbo
9c3a62a308 made it so punished players can't place signs 2016-01-10 21:03:34 +00:00
NewGarbo
68808efb49 made players not be able to chat while chat is silenced 2016-01-10 20:57:12 +00:00
NewGarbo
fa3de2a479 made clans ban messages not public 2016-01-10 20:55:29 +00:00
NewGarbo
51872faa04 fix mutes not working 2016-01-10 20:53:55 +00:00
NewGarbo
fa509f0043 fixed giant's broadsword giving HUGE regen. PLEASE PUSH ASAP 2016-01-09 19:58:31 +00:00
Shaun Bennett
ee73b374a6 Forgot to uncomment in ClansLoginManager 2016-01-08 06:36:59 -05:00
Shaun Bennett
a75e2c15b8 Merge remote-tracking branch 'origin/develop' into develop 2016-01-08 06:35:37 -05:00
NewGarbo
025615d080 Clans Alpha 0.18b fixes 2016-01-08 11:24:36 +00:00
Shaun Bennett
0a56a838d2 Fix ClansLoginManager, Remove pointless code in CoreClientManager 2016-01-08 05:45:49 -05:00
NewGarbo
15d2118bc1 Added C.Mod rank, and started on rank info. 2016-01-07 23:32:51 +00:00
NewGarbo
e1e8c2bb97 changed outpost forcefields to be a bit larger to surround the outpost more. 2016-01-07 21:02:55 +00:00
NewGarbo
43f075014a made outposts have a "forcefield" whilst they are being built. also made legendary announcements a different color as per Simon's request. 2016-01-07 20:05:33 +00:00
NewGarbo
fff6d8e03f added server shutdown event, along with making the outposts cleanup on server shutdown to prevent debris of currently in-play outposts sticking around. 2016-01-07 19:36:52 +00:00
NewGarbo
90a06d97b5 fixed npe on cleanup() because it doesn't check if the holograms are null or not. (they may or may not be null at the time of cleanup() being called depending on the current state of the outpost) 2016-01-07 14:04:26 +00:00
NewGarbo
d4fdda8ef2 fixed outpost being built instantly on output block place. 
cleaned up a bit
 2016-01-07 14:03:15 +00:00
NewGarbo
5c810a46c9 holograms above outpost block should be centered in the block and made them despawn on outpost death 2016-01-07 13:26:18 +00:00
NewGarbo
e9789b2ee8 legendary pickkup message fix (FINALLY FIXED NOW ) 2016-01-07 10:31:23 +00:00
NewGarbo
d88b14d9d6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 2016-01-07 09:35:07 +00:00
NewGarbo
b685a207bc quick modification to outposts, and fixed the legendary announcements being weird 2016-01-07 09:34:16 +00:00
NewGarbo
ef929b39b3 updated clans version 2016-01-06 22:38:45 +00:00
NewGarbo
76c0230805 quikc change 2016-01-06 22:35:09 +00:00
NewGarbo
52c4a55180 outpost changes, and some other things 2016-01-06 22:32:36 +00:00
NewGarbo
b47665e115 lots of work on outposts, 
fixed gold dupe glitch,
fixed clans ban gui title being "Customize New Gear".
 2016-01-02 14:02:50 +00:00
Shaun Bennett
d08cfa0c4c Holiday Gifts 2015-12-25 01:51:36 -06:00
NewGarbo
aa50c4762f fixes (?) 2015-12-23 18:55:44 +00:00
libraryaddict
1d4a5e5804 Clean up imports, set resource pack on clans. 2015-12-24 07:47:05 +13:00
libraryaddict
000b1f85b7 Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into develop 2015-12-24 07:41:55 +13:00
libraryaddict
67bdc6832f Tentative beginnings for clans resource packs 2015-12-24 07:40:49 +13:00
NewGarbo
369687b5dd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 
Conflicts:
	Plugins/Mineplex.Game.Clans/.settings/org.eclipse.jdt.core.prefs
 2015-12-23 18:31:51 +00:00
NewGarbo
ff24ebc9f4 lots of changes that i can't remember at this point 2015-12-23 18:22:20 +00:00
NewGarbo
1840572c49 Lots of changes, specifics: 
Fixed clans having more than max energy.
Made /c home work from anywhere, 20 secs warmup, 30 secs in claimed territory.
/c <clan> now works with clans with 18+ players.
 2015-12-18 11:13:38 +00:00
Shaun Bennett
f80648bfbc Update DBPool to load from file 2015-12-18 00:32:07 -05:00
NewGarbo
4bf7e15055 player gold exploit checking. i know this code is strange but please don't delete it. we need it for now. 2015-12-18 01:05:02 +00:00
NewGarbo
b4c3ce9fba a couple more prettificatons to pvp timer messages. 2015-12-16 23:19:04 +00:00
NewGarbo
eb9ba92fb1 one more quick message change/fix 2015-12-16 22:53:24 +00:00
NewGarbo
2ee1ccbcf9 qa changes to pvp safety 2015-12-16 22:48:55 +00:00
NewGarbo
d619a9644b few changes to pvp timer, and fixed bugs etc 2015-12-16 18:25:30 +00:00
NewGarbo
7ac1fd86b4 made pvp timer players immune to skills 2015-12-15 21:12:49 +00:00
NewGarbo
baef84f4d9 fixed pvp timer subtitles bugged out 2015-12-15 20:09:54 +00:00
Shaun Bennett
607c164753 Merge remote-tracking branch 'remotes/origin/clans/alpha' into develop 2015-12-15 13:55:01 -05:00
NewGarbo
6a346790f7 disable tutorial 2015-12-15 12:00:56 +00:00
NewGarbo
1da04b84b5 test push (change version to 0.17d) 2015-12-15 11:57:33 +00:00
NewGarbo
9137fcfe40 loads of changes (pvp timer, unsafe stuff) 2015-12-14 12:39:00 +00:00
Shaun Bennett
6c2b40d63a Cannon work 2015-12-13 15:40:32 -05:00
libraryaddict
e7213fdb7e Remove project specific settings 2015-12-13 16:41:37 +13:00
NewGarbo
667f076202 fixed unsafe timer 2015-12-09 10:46:05 +00:00
NewGarbo
425463d339 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-12-06 19:11:13 +00:00
NewGarbo
a9c7f088f3 made use ability teleport player back to where they should be 2015-12-06 19:10:18 +00:00
Shaun Bennett
11e1e53a36 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-12-05 21:36:19 -05:00
Shaun Bennett
d5a9a92913 Forgot to push these changes last update! 2015-12-05 21:36:07 -05:00
NewGarbo
5d59b1a015 fixed tnt blowing up in claims when offline 2015-12-04 18:32:46 +00:00
NewGarbo
bca65116ab fixed task not getting cleanup up after /skiptutorial 2015-12-04 18:23:23 +00:00
Shaun Bennett
f57f4ed0aa Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-12-04 12:10:10 -05:00
NewGarbo
e158704534 fixed /skiptutorial not working, and fixed tutorial thinking you're still in tutorial after finishing/cancelling/skipping 2015-12-04 15:58:51 +00:00
Shaun Bennett
bb382a969c Fix heavy attribute, disable claim visualizer 2015-12-04 08:02:38 -05:00
NewGarbo
3b125dc8a5 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/RestartTutCommand.java
 2015-12-04 11:12:19 +00:00
Shaun Bennett
2435ebba13 Disable subtasks for now 2015-12-04 05:16:14 -05:00
Shaun Bennett
5c575b41fc Clans alpha 0.17 2015-12-04 05:15:28 -05:00
NewGarbo
39daf969fd clan claim visualizer 2015-12-03 22:29:36 +00:00
NewGarbo
584a02ae3e fixed infinite claims 2015-12-03 10:30:06 +00:00
NewGarbo
e9fd661311 disabled koth 2015-12-02 18:25:53 +00:00
NewGarbo
8fea5afdce fixed message on tick (might be cause of laggg) 2015-12-02 06:56:58 +00:00
NewGarbo
92c1abf221 a few last touches 2015-12-02 06:04:53 +00:00
NewGarbo
8db5ffe5c7 forcejoin command for ADMIN+ and fixed auto tree replanting. 2015-12-02 05:54:00 +00:00
NewGarbo
3a4e453ac3 made it so that you can only use /reset in safe zones 2015-12-02 05:18:04 +00:00
NewGarbo
d6ca52e4a4 modifications 2015-12-02 05:11:09 +00:00
NewGarbo
b8e2086928 changes to tutorial 2015-12-02 00:19:48 +00:00
NewGarbo
ba27d94158 fixed skiptutorial message not displaying 2015-12-01 23:23:11 +00:00
NewGarbo
cffb6bd62f bunch o' changes 2015-12-01 23:01:41 +00:00
NewGarbo
a7d6026c07 made skip tutorial messages be seen whilst in tutorial 2015-12-01 22:33:47 +00:00
NewGarbo
69cb395f5a made entire clan know about disband 2015-12-01 22:30:05 +00:00
NewGarbo
35ae89ab1f fixed players from being able to eat their carrot in the making money task 2015-12-01 19:37:53 +00:00
NewGarbo
ea099d7a82 fixed some annoying bugs and fixed certain messages not showing in tutorial 2015-12-01 18:41:33 +00:00
NewGarbo
fbf9c8eb0c made certain messages visible in tutorial that are actually required to be seen 2015-12-01 13:37:34 +00:00
NewGarbo
f536bf23e5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-12-01 12:06:25 +00:00
NewGarbo
d32e6fdb96 Got rid of deployed tasks. using different system now. (untested) 2015-12-01 11:28:14 +00:00
Jonathan Williams
03a1f19df9 Fixed memory leaks in Disguise and Recall. 
Removed debug messages in ItemMapManager
 2015-11-30 23:49:16 -06:00
NewGarbo
1a851679c4 made it so players cannot see chat whilst in tutorial 2015-11-30 20:40:30 +00:00
NewGarbo
6eb44ed87b whoops.. this isn't php hehe 2015-11-30 19:11:18 +00:00
NewGarbo
813e7ee789 made it so that no messages are shown when in tutorial 2015-11-30 19:08:16 +00:00
NewGarbo
0862cfce72 fixed doors getting placed in spawn and shops 2015-11-30 07:26:02 +00:00
NewGarbo
261d6dd030 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-30 07:08:34 +00:00
NewGarbo
f528531b82 removed some testing stuff 2015-11-30 07:06:36 +00:00
Shaun Bennett
34c4bade06 Merge remote-tracking branch 'origin/master' 2015-11-29 19:30:51 -05:00