5aabd00972
set hub to christmas
...
removed snowball pickup
disabled arrows sticking into players from ALL projectiles
2015-12-06 14:55:28 +11:00
5b04a3223d
Fixed bug with Posion effect NPE (Something in champs is adding a null source).
...
Fixed bug with Tutorial cleanup.
2015-11-29 02:29:47 -06:00
a9669ade31
Immolate fix hopefully
2015-11-27 06:05:22 +00:00
20a9ed5a6e
staff not being able to join fix
2015-11-27 05:13:47 +00:00
56d4b34969
fixed formatting on death notices.
...
Made world event middle texts longer lasting.
Fixed logout NPC timer
2015-11-26 21:57:26 +00:00
ff5d828dd7
Merge with master, lots of clans fixes/work
2015-11-25 14:50:49 -05:00
7454cf7443
MS + Champs bugs, balance and more
2015-11-24 15:23:37 +11:00
6eb1bef1c6
Merge branch 'master' into minestrike-update
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
2015-11-21 11:09:28 +11:00
4a70e4da90
more fixies
2015-11-21 10:34:08 +11:00
4d128d9c7a
fixed some skills and wierd hitbox error
2015-11-21 10:29:48 +11: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
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
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
e4981c7491
Undead camp finishing stuff
2015-11-14 20:30:37 +00:00
259397b6ae
READY 2 GO
2015-11-14 12:52:14 +11:00
5586132429
champions balance
2015-11-14 11:05:51 +11:00
bbc7bf770c
1.8 Fixes - Still doing map fix
2015-11-12 19:18:42 -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
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
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
d971e3c8a3
ms update
2015-11-11 12:46:58 +11:00
4eaa165826
such format
2015-11-11 07:54:13 +11:00
b7bf4765c4
DANG YOU WILLIAM
2015-11-03 22:05:17 +00:00
7f03ca0936
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
...
Conflicts:
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/StaticLazer.java
2015-11-03 21:19:17 +00:00
975ad9e6ea
Update to master
2015-11-03 15:05:56 +13:00
3de906ab19
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/CustomDamageEvent.java
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitKnight.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
2015-11-03 14:57:25 +13:00
396ce75087
Bug fixes/Additions:
...
- Being able to kill clan mates/create mode players who combat log.
- Added a notice that the player was killed, when a player logs back in after being killed when combat logging.
- Fixed Fall Damage making a player unsafe in safe territories.
- Fixed Alligator's Tooth damage.
- Fixed Alligator's Tooth working in lava.
- Added a UtilFile to Mineplex.Core.Common, for all stuff files!
2015-10-30 22:13:19 +00:00
301b8012ff
Final commit
2015-10-30 19:30:17 +13:00
ea1e4b79f7
Changes from SnD branch
2015-10-30 19:25:02 +13:00
ed18588a6a
Fix missing code and stuff
2015-10-30 19:12:04 +13:00
7f025ad029
Fix CustomExplosion
2015-10-24 08:40:43 +13:00
02bf202d52
1.8 update
2015-10-17 13:21:03 +13:00
3dda9352e7
Progress
2015-10-16 13:32:23 +13:00
58a86c5abb
That's the easy stuff done..
2015-10-13 19:49:15 +13:00
2b9a66e7b2
more ssm update
2015-10-12 16:32:23 +11:00
f8ef46abde
Merge master code into clans
2015-09-28 21:41:05 -04:00
2a77eda4fc
Spider boss code
2015-09-25 14:08:47 +12:00
69517a3dcb
Refresh the name after custom stuff is done so it applies on disguises
2015-09-25 14:08:27 +12:00
655283e008
Progress on spider
2015-09-14 23:23:12 +12:00
d9142ac33f
smash balance
2015-09-14 12:34:55 +10:00
6474f5a9e9
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
2015-09-06 16:23:18 +12:00
21d9f5767e
CustomTagFix support changing and removing of names.
2015-09-04 19:23:33 +12:00
5d77202370
Add SrMod to blacklist, prevent armor from breaking when hitting people with it, stop firing block toss event if you cant use block toss
2015-08-30 12:41:15 -07:00
4b7a4a4d5c
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta
2015-08-29 18:58:43 -07:00
cbab8861d8
SNakes!!
2015-08-29 18:58:33 -07:00
368ed955ea
qwrwr
2015-08-29 18:58:12 -07:00
f4ade8e9f7
Snnkes
2015-08-29 17:05:47 -07:00
Cheese
Jonathan Williams
NewGarbo
Shaun Bennett
Shaun Bennett
libraryaddict
Mini-Chiss