Commit Graph

4783 Commits

Author SHA1 Message Date
NewGarbo 08f683aa98 gave Archers in undead camps the barbed arrows effect 2015-11-20 07:49:28 +00:00
NewGarbo b0c60fd1f4 sparkly rare items! woo. and fixed gold dropping waaayyy too much 2015-11-19 19:03:51 +00:00
NewGarbo 7d8e1b517d Fixed dropped gold stacking... 2015-11-19 08:56:07 +00:00
NewGarbo f262a22913 Fixed loot dropping in King of the Hill not dropping correct items/ 2015-11-19 08:54:59 +00:00
NewGarbo 6372dfd629 fixed ArithmeticException / 0 in ClansEnergyTracker. 2015-11-19 08:29:50 +00:00
NewGarbo 0a667afeb1 finally fixed beds. major cleanup of code, much more organized now, thank you, Me!!!! oh my god both of my eyes are twitching 2015-11-18 22:27:01 +00:00
NewGarbo eded09b1a9 fixed yet another bug with beds... argh it seems to be working fine now. 2015-11-18 21:02:39 +00:00
NewGarbo 6f3693f804 more bug fixes 2015-11-18 19:32:20 +00:00
NewGarbo 924504ac9f fixed clans home NPE. also added GRASS to UtilItem's item property system. 2015-11-18 19:03:44 +00:00
NewGarbo 16eecdd112 fixed clan energy alerts going off incorrectly 2015-11-18 17:30:45 +00:00
NewGarbo 5c2569e822 revert certain permissions from being ALL or containing JR.DEV (that were used for testing) 2015-11-18 16:20:27 +00:00
NewGarbo 5c383a1df3 cleaned up /sethome old bed removal, as previous way would delete any beds around the home bed, which would destroy 2015-11-18 12:24:28 +00:00
NewGarbo 9eaffc8acf Added methods into UtilBlock to place beds and doors. updated /sethome to use the new method for placing beds. i'm sure they'll come in handy later on. 2015-11-18 12:17:00 +00:00
NewGarbo cd0ce57691 replaced useless looping with just checking the rotation of the bed. 2015-11-18 09:58:06 +00:00
NewGarbo 1ea87b8354 Fixed an NPE when destroying a Clan's Home 2015-11-18 09:37:32 +00:00
NewGarbo 03764ad480 removed the disallowing of interaction in ClansGame.java if the block that the player is hitting, is a Clan's Home. This was messing up the other code for Clan Home bed stuff. 2015-11-18 08:40:24 +00:00
NewGarbo f5e12e5014 formatted ClansGame.java (separate commit because confusion otherwise) 2015-11-18 08:37:34 +00:00
NewGarbo 77f234e5f5 Made energy warnings stay for longer 2015-11-18 08:32:48 +00:00
NewGarbo 185f19fb6a fixed clan energy warnings being sent to all players on the server instead of the clan. 2015-11-18 08:13:13 +00:00
NewGarbo 6da628abe1 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-18 07:40:35 +00:00
NewGarbo f79c282225 Clan energy warnings implemented. (not tested yet) 2015-11-18 07:39:00 +00:00
Shaun Bennett 4f63d90bac Only show player location for allies/self 2015-11-17 18:42:06 -05:00
Shaun Bennett 01a57dde2f Fix formatting of ally messages 2015-11-17 18:39:15 -05:00
Shaun Bennett 52c55335fa Add chunk to unclaim map 2015-11-17 18:33:21 -05:00
Shaun Bennett ab8f9cb992 Fix map color 2015-11-17 18:31:38 -05:00
Shaun Bennett 4183f0ce07 Merge remote-tracking branch 'origin/clans-beta' into clans-beta
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansGame.java
2015-11-17 18:05:17 -05:00
Shaun Bennett f6cfc36e9f War Invasion, GUI Improvements, New ClanRelation for Winning/Losing War, Update Clan Map for new relation, Show invasions in scoreboard 2015-11-17 17:59:35 -05:00
NewGarbo c23b2f54f5 Removed arbitrary boundary around admin territories (Chiss' request) 2015-11-17 22:41:51 +00:00
NewGarbo 9b866145ea Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-17 22:24:58 +00:00
NewGarbo 31906b025f Clans Home switched over to using physical beds.
Changed "You cannot [break/place/use] [blocks/items] in [territory]" to something more simple (as per Chiss' request)
2015-11-17 22:24:19 +00:00
Shaun Bennett 6187b5e680 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-16 17:34:47 -05:00
Shaun Bennett c3cd0e3ad2 Fix chat formatting, open clan shop with /c 2015-11-16 17:31:24 -05:00
libraryaddict f95bec0f15 Fix up mapmanager, untested 2015-11-17 11:30:04 +13:00
Shaun Bennett a153ffdc38 Fix enchant tables opening the wrong gui 2015-11-16 17:29:25 -05:00
Shaun Bennett 5b30cfb67e Fix War Points bug 2015-11-16 17:27:56 -05:00
NewGarbo 0d372cefaa Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-16 19:41:46 +00:00
NewGarbo 181642e200 give undead warriors stone swords. 2015-11-16 19:41:09 +00:00
Shaun Bennett 07f92d2e6e Merge remote-tracking branch 'origin/clans-beta' into clans-beta
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanInfo.java
2015-11-16 14:39:47 -05:00
Shaun Bennett 2627aa9933 War/War Points Update 2015-11-16 14:37:32 -05:00
NewGarbo 580ec27738 hmm getTitle() in FieldBlock returns null (presumably accidentally), and forgot to update getters with interfaces. 2015-11-15 21:03:48 +00:00
NewGarbo c6f73d6e9a oh deary me, i appear to have gone on a rampage of changing everything to interfaces. 2015-11-15 21:01:27 +00:00
NewGarbo 24dee0ebf6 updated ScoreboardElement to use the interface instead of the implementation. PLEASE NEVER USE THE IMPLEMENTATION FOR DEFINING THE TYPE!!! 2015-11-15 20:52:45 +00:00
NewGarbo fff248ad86 king of the hill gold drop fix 2015-11-15 20:37:37 +00:00
NewGarbo 5209cf3d38 fixed an annoying IllegalArgument with the World Event start command. fixed limit bukkit runnable not limiting itself. 2015-11-15 20:04:44 +00:00
NewGarbo 10eb1bb9c9 enum change didn't commit in the last commit ugh 2015-11-15 19:57:16 +00:00
NewGarbo 22ae67ba81 king of the hill changes. (renamed enum for it for ease of typing) 2015-11-15 19:57:00 +00:00
NewGarbo c247fe9317 World event prettification and fixes 2015-11-15 18:19:28 +00:00
NewGarbo 2aa7dd13c3 fixed NullPointerException 2015-11-15 15:05:18 +00:00
NewGarbo 1d8366487b Fixed King of the Hill from not working at all, and some other tiny fixes 2015-11-15 14:33:29 +00:00
NewGarbo 33d358ac6a Quick fix in EventTerrainFinder because of incorrect block checking.
Added a constant "GOLD_PER_TICK" in the King of the Hill code, because hardcoded numbers are no fun.
Commented out some strange useless code.

Renamed getTicks() to getTicksRunning() and _ticks to _ticksRunning.
2015-11-15 12:09:31 +00:00