Commit Graph

711 Commits

Author SHA1 Message Date
NewGarbo 76dba421b4 sapling fix [THIS NEEDS TO GET PUT ONTO CLANS/ALPHA] 2016-01-29 20:54:31 +00:00
NewGarbo f86262dc0e catapult and cannon progress 2016-01-28 23:32:23 +00:00
NewGarbo 37fb656279 dispenser 2016-01-28 13:31:45 +00:00
NewGarbo f645c4d6f8 Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta 2016-01-28 13:30:50 +00:00
NewGarbo 88c1391ba2 disallow sapling in dispensers (grrr working in two different branches is really strange) 2016-01-28 13:30:16 +00:00
NewGarbo 8cb5591218 merge conflicts 2016-01-28 13:28:39 +00:00
NewGarbo a0cc0b7ec9 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/Gameplay.java
2016-01-28 13:28:00 +00:00
NewGarbo b5f04011e5 fixed chatslow not working + filter not working for players not in clan 2016-01-28 13:24:30 +00:00
NewGarbo ceeeb3bc45 no tnt from dispensers 2016-01-28 10:58:46 +00:00
NewGarbo 682a243c31 fixed catapult state being mapped to incorrect blocks 2016-01-28 09:18:58 +00:00
NewGarbo 7f7e73a101 more catapults! 2016-01-26 21:10:58 +00:00
NewGarbo 3d7a371d1d catapults 2016-01-26 20:18:53 +00:00
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
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