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
2bb82da735
Motd update
2015-11-14 01:45:55 -05:00
4a73bce586
Added gadget and projectileUser logging.
2015-11-14 00:36:34 -06:00
487f974951
Clan Gui updates and code cleanup
2015-11-13 23:53:34 -05:00
e7b86b4462
hub skytext
2015-11-14 13:05:11 +11:00
60a6a81587
faster cleanup
2015-11-14 13:03:41 +11:00
9518b64e3c
clean up snowballs
2015-11-14 12:55:43 +11:00
259397b6ae
READY 2 GO
2015-11-14 12:52:14 +11:00
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
5586132429
champions balance
2015-11-14 11:05:51 +11:00
8a972075da
Formatted WorldEventManager (seperate commit for formatting so that confusion doesn't arise in future commits)
2015-11-13 21:19:50 +00:00
a0ac15dec5
Allowed Jr.Devs to start/clear world events.
2015-11-13 21:01:09 +00:00
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
010f30f064
Made the alpha login message only send one (forgot to save the task manager stuff)
2015-11-13 20:57:33 +00:00
8ba9a8f6c4
Fix border radius
2015-11-12 22:38:26 -05:00
40138b6914
1.8 fix
2015-11-12 22:35:56 -05:00
f3e94cc035
Map fix (probably broken?!)
2015-11-12 21:35:01 -05:00
016e54977d
- Finish game [FINALLY]
2015-11-12 21:16:58 -05:00
9de3981dec
ms update
2015-11-13 11:24:11 +11:00
bbc7bf770c
1.8 Fixes - Still doing map fix
2015-11-12 19:18:42 -05:00
639d2d110f
Merge remote-tracking branch 'remotes/origin/master' into clans-beta
2015-11-12 17:55:33 -05:00
c4e188296a
Fix compiler and misc
2015-11-12 17:55:00 -05:00
0b41450603
Revert "Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta""
...
This reverts commit 6c17b2926c
2015-11-12 17:51:13 -05:00
3122397f7a
Merge branch 'master' into minestrike-update
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
2015-11-13 09:19:44 +11:00
6c17b2926c
Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta"
...
This reverts commit ce1c09b88f1aef7fe0b9
2015-11-12 16:35:31 -05:00
Jonathan Williams
AlexTheCoder
libraryaddict
NewGarbo
Shaun Bennett
Shaun Bennett
Cheese