Shaun Bennett
e35eec4cb1
Update motdmanager and compiler.xml
2015-11-16 16:39:34 -05:00
libraryaddict
208d90c4bc
Fixed getTargetBlock being 0 when its infinite
2015-11-17 10:18:42 +13: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
Virizion
2e9ac8df4d
First commit.
2015-11-15 22:06:11 -05:00
Jonathan Williams
88dbe261db
Added logging for stacker.
2015-11-15 18:34:35 -06:00
Jonathan Williams
ac792dcd02
Removed some unnecessary code in updateRank and opened up all ranks to be used.
2015-11-15 18:33:43 -06:00
AlexTheCoder
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
libraryaddict
e5b376bc5c
Fixed wrong CB
2015-11-16 12:48:26 +13:00
AlexTheCoder
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
AlexTheCoder
ecaa4a49b4
- Fix for stats
2015-11-15 17:48:00 -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
libraryaddict
aaf3705cc7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-11-16 06:57:09 +13:00
libraryaddict
6e55074211
Add entitydismountevent
2015-11-16 06:56:39 +13:00
Mysticate
399edbab29
Sniper work
2015-11-15 12:47:45 -05: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
NewGarbo
e28059848c
New 1.7 leaves fix for UtilBlock#getHighest()
2015-11-15 08:51:59 +00:00
NewGarbo
1398987ff7
Removed currently unused world event types.
2015-11-15 08:49:44 +00:00
NewGarbo
321d840cfd
Throwing RuntimeException instead of legacy assert expression.
2015-11-15 08:28:57 +00:00
fooify
5767d4e2db
SSM bug fix: magma cube flame dash doesn't make player invisible
2015-11-14 16:08:14 -08:00
Shaun Bennett
f90b137ccd
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-14 16:46:03 -05:00
NewGarbo
e4981c7491
Undead camp finishing stuff
2015-11-14 20:30:37 +00:00
Mysticate
746aab7786
Merge remote-tracking branch 'origin/master' into Myst_KITS
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/PlayerCopy.java
2015-11-14 14:50:48 -05:00
fooify
db21d627d8
Merge remote-tracking branch 'origin/master' into foo
2015-11-14 09:13:51 -08:00
Jonathan Williams
daee44d262
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-14 02:01:24 -06:00
Shaun Bennett
9f37e3e595
Merge remote-tracking branch 'origin/master'
2015-11-14 01:46:44 -05:00
Shaun Bennett
2bb82da735
Motd update
2015-11-14 01:45:55 -05:00
Jonathan Williams
4a73bce586
Added gadget and projectileUser logging.
2015-11-14 00:36:34 -06:00
Shaun Bennett
487f974951
Clan Gui updates and code cleanup
2015-11-13 23:53:34 -05:00
Cheese
e7b86b4462
hub skytext
2015-11-14 13:05:11 +11:00
Cheese
60a6a81587
faster cleanup
2015-11-14 13:03:41 +11:00
Cheese
9518b64e3c
clean up snowballs
2015-11-14 12:55:43 +11:00
Cheese
259397b6ae
READY 2 GO
2015-11-14 12:52:14 +11:00
fooify
f9f4c2addc
fixed several smash bugs and one global issue
2015-11-13 17:28:25 -08:00
Cheese
770e2be44b
Merge branch 'master' into alex-ctf
...
Conflicts:
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java
2015-11-14 11:07:44 +11:00
Cheese
5586132429
champions balance
2015-11-14 11:05:51 +11:00
NewGarbo
8a972075da
Formatted WorldEventManager (seperate commit for formatting so that confusion doesn't arise in future commits)
2015-11-13 21:19:50 +00:00
NewGarbo
a0ac15dec5
Allowed Jr.Devs to start/clear world events.
2015-11-13 21:01:09 +00:00
NewGarbo
98be3a51a0
Added a Speed I effect to the UndeadWarrior and UndeadArcher creatures that spawn in the UndeadCamp world event.
2015-11-13 21:00:08 +00:00
