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
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
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
Shaun Bennett
487f974951
Clan Gui updates and code cleanup
2015-11-13 23:53:34 -05: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
NewGarbo
010f30f064
Made the alpha login message only send one (forgot to save the task manager stuff)
2015-11-13 20:57:33 +00:00
Shaun Bennett
8ba9a8f6c4
Fix border radius
2015-11-12 22:38:26 -05:00
Shaun Bennett
40138b6914
1.8 fix
2015-11-12 22:35:56 -05:00
Shaun Bennett
f3e94cc035
Map fix (probably broken?!)
2015-11-12 21:35:01 -05:00
Shaun Bennett
bbc7bf770c
1.8 Fixes - Still doing map fix
2015-11-12 19:18:42 -05:00
Shaun Bennett
639d2d110f
Merge remote-tracking branch 'remotes/origin/master' into clans-beta
2015-11-12 17:55:33 -05:00
Shaun Bennett
c4e188296a
Fix compiler and misc
2015-11-12 17:55:00 -05:00
Shaun Bennett
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
Shaun Bennett
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
Shaun Bennett
875c399c9f
Merge branch 'master' into clans-beta
2015-11-11 21:31:03 -05:00
Shaun Bennett
33680e829a
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-11-11 21:25:32 -05:00
libraryaddict
25f299b490
Fix interact types
2015-11-12 14:34:12 +13:00
Shaun Bennett
e66bebcfb1
Give all treaure items when opening the chest
2015-11-11 18:13:47 -05:00
Shaun Bennett
994a9e3e43
Clans Gui Work, commiting so I can switch branches
2015-11-11 18:05:48 -05:00
NewGarbo
ce1c09b88f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
...
Conflicts:
Plugins/.idea/compiler.xml
Plugins/Classpath.Dummy/src/net/minecraft/server/v1_7_R4/PacketPlayOutPlayerInfo.java
Plugins/Libraries/craftbukkit.jar
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketVerifier.java
Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemFactory.java
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java
2015-11-11 19:35:44 +00:00
libraryaddict
ba7515f761
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-11-12 04:27:17 +13:00
libraryaddict
b915131407
Fix some armorstands and interaction bugs
2015-11-12 04:26:55 +13:00
Jonathan Williams
27ef2c0bbb
Fixed UtilEnt.Leash method.
2015-11-11 04:36:10 -06:00
Jonathan Williams
0e6146d5c9
Added expire to Stacker throw.
2015-11-11 04:32:56 -06:00
libraryaddict
3e6d73221b
Disabled a fix
2015-11-11 15:21:17 +13:00
Cheese
4dd9b0967a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-11 12:50:07 +11:00
Cheese
a47752cfe2
disabled usage of /minecraft: commands in 1..8
2015-11-11 12:49:19 +11:00
libraryaddict
ee286c2676
Disable /minecraft commands
2015-11-11 13:49:06 +13:00
libraryaddict
7559d1feb5
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-11-11 11:45:40 +13:00
libraryaddict
f18c55cbd9
Fix schedulers
2015-11-11 11:45:17 +13:00
Cheese
4eaa165826
such format
2015-11-11 07:54:13 +11:00
Cheese
b3125e40ff
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-11 07:43:01 +11:00
libraryaddict
6983af944f
Fix a craftbukkit bug
2015-11-11 00:25:20 +13:00
libraryaddict
37fdf53a51
Fixed champion's Illusion crash
2015-11-11 00:21:28 +13:00
libraryaddict
1a2c163ce2
Fix scoreboard out of bounds error
2015-11-11 00:03:08 +13:00
Jonathan Williams
6e90052480
Updated StaffServer to 1.8
2015-11-10 02:01:39 -06:00
Cheese
0a9c97c32a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-10 18:05:01 +11:00
Shaun Bennett
2707173a8b
Merge with 1.8 Branch
2015-11-10 01:48:33 -05:00
