52c55335fa
Add chunk to unclaim map
2015-11-17 18:33:21 -05:00
ab8f9cb992
Fix map color
2015-11-17 18:31:38 -05:00
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
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
c23b2f54f5
Removed arbitrary boundary around admin territories (Chiss' request)
2015-11-17 22:41:51 +00:00
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
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
e19d4e11e1
Added GlobalGiveCoins. Changes Gems a little and the manager.
2015-11-17 18:54:39 +00:00
a28adc9673
More global stuff! Added GlobalGiveGems.
2015-11-17 18:26:19 +00:00
0f7c52391f
Global Packet work. Added giveitem sub-command.
2015-11-17 08:19:36 +00:00
6187b5e680
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-16 17:34:47 -05:00
c3cd0e3ad2
Fix chat formatting, open clan shop with /c
2015-11-16 17:31:24 -05:00
f95bec0f15
Fix up mapmanager, untested
2015-11-17 11:30:04 +13:00
a153ffdc38
Fix enchant tables opening the wrong gui
2015-11-16 17:29:25 -05:00
5b30cfb67e
Fix War Points bug
2015-11-16 17:27:56 -05:00
adfc2f19eb
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-17 09:20:15 +11:00
46505a8e8e
converted to new res pack locations
2015-11-17 09:19:33 +11:00
007d5a00dc
Merge remote-tracking branch 'origin/master'
2015-11-16 16:39:43 -05:00
e35eec4cb1
Update motdmanager and compiler.xml
2015-11-16 16:39:34 -05:00
208d90c4bc
Fixed getTargetBlock being 0 when its infinite
2015-11-17 10:18:42 +13:00
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
181642e200
give undead warriors stone swords.
2015-11-16 19:41:09 +00:00
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
2627aa9933
War/War Points Update
2015-11-16 14:37:32 -05:00
88dbe261db
Added logging for stacker.
2015-11-15 18:34:35 -06:00
ac792dcd02
Removed some unnecessary code in updateRank and opened up all ranks to be used.
2015-11-15 18:33:43 -06:00
217509b75a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
Conflicts Resolved
2015-11-15 18:58:20 -05:00
e5b376bc5c
Fixed wrong CB
2015-11-16 12:48:26 +13:00
667edc8a90
Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
2015-11-15 17:48:16 -05:00
ecaa4a49b4
- Fix for stats
2015-11-15 17:48:00 -05:00
580ec27738
hmm getTitle() in FieldBlock returns null (presumably accidentally), and forgot to update getters with interfaces.
2015-11-15 21:03:48 +00:00
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
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
fff248ad86
king of the hill gold drop fix
2015-11-15 20:37:37 +00:00
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
10eb1bb9c9
enum change didn't commit in the last commit ugh
2015-11-15 19:57:16 +00:00
22ae67ba81
king of the hill changes. (renamed enum for it for ease of typing)
2015-11-15 19:57:00 +00:00
c247fe9317
World event prettification and fixes
2015-11-15 18:19:28 +00:00
aaf3705cc7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-11-16 06:57:09 +13:00
6e55074211
Add entitydismountevent
2015-11-16 06:56:39 +13:00
2aa7dd13c3
fixed NullPointerException
2015-11-15 15:05:18 +00:00
1d8366487b
Fixed King of the Hill from not working at all, and some other tiny fixes
2015-11-15 14:33:29 +00:00
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
e28059848c
New 1.7 leaves fix for UtilBlock#getHighest()
2015-11-15 08:51:59 +00:00
1398987ff7
Removed currently unused world event types.
2015-11-15 08:49:44 +00:00
321d840cfd
Throwing RuntimeException instead of legacy assert expression.
2015-11-15 08:28:57 +00:00
f90b137ccd
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-14 16:46:03 -05:00
e4981c7491
Undead camp finishing stuff
2015-11-14 20:30:37 +00:00
daee44d262
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-14 02:01:24 -06:00
9f37e3e595
Merge remote-tracking branch 'origin/master'
2015-11-14 01:46:44 -05:00
Shaun Bennett
NewGarbo
William Burns
libraryaddict
Cheese
Shaun Bennett
Jonathan Williams
AlexTheCoder