2615ef74dd
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-21 05:09:54 -04:00
e7da161f35
Revert "Fixed PC-706"
...
This reverts commit 96d16be5b7
2016-07-20 20:07:06 -05:00
08850d909f
Further work on brood mother boss and nether
2016-07-16 21:59:03 -04:00
917b83250d
Revert "Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing"
...
This reverts commit 30287a0832b8650d741d
2016-07-14 00:10:37 -05:00
3acca23e7e
Remove emerald drops from Skeleton King minions and decrease the range EventCreatures can go from their spawn
2016-07-12 05:20:22 -04:00
d3270b9289
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-11 14:50:16 -04:00
30287a0832
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing
2016-07-11 14:46:08 -04:00
0be317e5be
Implement tweaks and finalize implementations for bosses and fix loot dropping bugs
2016-07-11 11:36:48 -04:00
b8650d741d
Fixed PC-707
...
Fixed arrows damaging the shooter.
Fixed all instances of arrows bouncing of targets.
2016-07-08 16:48:17 -05:00
96d16be5b7
Fixed PC-706
...
Tweaked settings to reasonable values in local testing.
2016-07-08 16:48:11 -05:00
e8a1c9bcba
Add damage check to the Enchantment Handler...
...
...to avoid performing calculations where it is not necessary
2016-07-08 07:42:00 -04:00
63b6158fe4
More UHC Fixes
...
Fixes:
PC-137
PC-138
PC-497
PC-665
PC-710
PC-719
PC-754
Also fixes chunk synchronization issue, plugs potential memory leaks
Fancy spectating
Use enum priorities
2016-07-06 15:55:12 -04:00
eccd7deedc
Fix merge errors and properly force disable particles by checking the game's settings
2016-07-05 17:25:01 -04:00
8c93f92a92
Tweak all Necromancer abilities so they function well together and give the Necromancer a semi-AI for movement
2016-07-05 17:08:38 -04:00
cc7fc164bb
Implement Necromancer boss and give it some beginning attacks
2016-07-05 07:52:21 -04:00
5c37a6ceca
Repair spider boss death
2016-07-03 06:33:53 -04:00
0a67d381a3
Prevent bosses from leaving their arena
2016-07-03 05:44:05 -04:00
28853feb73
Update Iron Wizard mechanics
2016-07-03 05:43:50 -04:00
f1733875eb
Change rupture animation
2016-07-03 05:43:05 -04:00
e57910985c
Change earthquake animations
2016-07-03 05:42:44 -04:00
caf7e1086d
Completely revamp Iron Wizard boss, add spawn and despawn messages, and retire attacks that no longer fit the arena
2016-07-03 04:12:05 -04:00
d0a8ee18c0
Fix concurrent modification error caused by poison looping every tick
2016-07-02 19:07:55 -04:00
d4be749edc
Update Iron Wizard attack priority to use Earthquake when surrounded, lower blocks thrown during Cave In and implement Iron Skin arrow resistance
2016-07-02 17:47:19 -04:00
54cda56c11
Initial Commit
2016-07-02 17:16:42 -04:00
b0303a8870
Create new equations for Protection Enchantment functionality to make it work properly (Further fix for PC-311)
2016-06-30 17:41:09 -05:00
9c4b787436
Make protection enchantments actually protect wearer from damage (Fixes PC-311)
2016-06-30 17:41:09 -05:00
36bb0b9ae8
Force player visibility to refresh in games over a steady rate (Fixes PC-497)
2016-06-30 17:41:09 -05:00
3433e0e3bc
Merge branch 'project-cosmetics' into develop
2016-06-23 18:42:47 -05:00
2e1bb25b0b
Fix exceptions
2016-06-22 21:12:24 -04:00
cb71bf4ba5
Removes morphs from gadget persistence (PC-429)
2016-06-05 17:44:34 -03:00
1778bd4c28
Final little tweaks to Champions
2016-06-04 18:28:38 +01:00
9af2c7e9f4
Restore hunger after Hold. Fixes PC-334
2016-05-24 15:38:18 -04:00
516ad5a640
Check cancellation before continuing Takedown. Fixes PC-277
2016-05-24 13:15:29 -04:00
41846f835d
Bump listener priority, change wording. Fixes PC-308
2016-05-24 13:15:29 -04:00
17a4517e71
Merge remote-tracking branch 'origin/develop' into project-cosmetics
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
2016-05-05 21:03:15 +02:00
e139bea465
Fix kill messages inserting a space below them in chat.
2016-05-01 23:03:18 +01:00
b7099088a9
Merge remote-tracking branch 'origin/develop' into project-cosmetics
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/block/schematic/Schematic.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguisePlayer.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/data/TNTGenerator.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/MiscManager.java
2016-04-23 00:55:48 +02:00
70541fd6f2
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla
2016-04-22 05:41:24 -04:00
477acf044e
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
2016-04-22 04:34:21 -05:00
ef8474ae9d
Set default CustomExplosion maxFallingBlocks to 0
...
This fixes an exception thrown when the trap rune in Wizards is
activated.
2016-04-19 02:59:31 -05:00
d623d0982b
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla-merge
2016-04-17 12:02:08 -04:00
019cfe41cc
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
2016-04-15 12:40:54 -05:00
33b557eb10
- Huuuuuuuge amount of changes for chiss
2016-04-14 22:45:21 -04:00
b313bc5308
Make undead chests not show the 'you are not permitted to use ender chest' messages.
2016-04-10 16:52:54 +01:00
8b42de03cb
Debug messages for PoisonShock
2016-04-06 10:39:00 -05:00
dd5b2d5e3f
Fixed NPE with poison condition effect.
2016-04-05 00:36:18 -05:00
5ad877f864
So many fixes <3
2016-04-04 12:47:23 +10:00
0f22c4359d
PC-19 - Remove World Event messages for players in Tutorial
2016-03-31 00:02:51 +01:00
8b1b63c8b3
Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into Dual_1.9
...
Conflicts:
Patches/craftbukkit.jar
2016-02-18 16:45:37 +13:00
7645af8933
Should have fixed falling block explosions sometimes throwing exceptions
2016-02-16 17:41:16 +01:00
f6c38903f2
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2016-02-13 14:34:11 -05:00
197bcc9dbf
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java
2016-02-12 21:23:58 -05:00
690c2acce8
many valentine, such wow
2016-02-05 13:25:57 +11:00
50fc1f5a10
merge with develop
2016-01-29 03:44:04 -05:00
b84ec01597
- Huge amount of stuff
2016-01-26 22:52:45 -05:00
359655f417
Merge pull request #131 in MIN/mineplex from md_5/suspicious to develop
...
* commit '4927bb8c0b6b1fcebe41adf9f38489fe82116cfa':
Fix some misc suspicious calls to Collection methods.
2016-01-20 12:23:55 -06:00
ea315a1447
Merge remote-tracking branch 'remotes/origin/md_5/maven' into develop
...
# Conflicts:
# Plugins/Libraries/craftbukkit.jar
2016-01-20 10:19:09 -05:00
bb4091c7a6
Use Maven for Compilation
2016-01-20 11:20:58 +11:00
4927bb8c0b
Fix some misc suspicious calls to Collection methods.
2016-01-17 20:20:48 +11:00
d3452772ed
outposts work (grr git is weird trying to switch over to clans/beta)
2016-01-12 07:02:03 +00:00
c3e11e87ea
Fix small issues with burning and ignition
2016-01-12 19:10:32 +13:00
11da5a3fe1
Fix fire combusting and cancelled damage events
2016-01-12 18:56:48 +13:00
92c4450eea
Update the dual version
2015-12-30 21:12:11 +13:00
d16dd4a9d2
Merge remote-tracking branch 'origin/master' into update-paintball
2015-12-15 19:35:55 -05:00
b36bf37197
Merge remote-tracking branch 'origin/master' into update-paintball
2015-12-15 19:22:38 -05:00
607c164753
Merge remote-tracking branch 'remotes/origin/clans/alpha' into develop
2015-12-15 13:55:01 -05:00
9137fcfe40
loads of changes (pvp timer, unsafe stuff)
2015-12-14 12:39:00 +00:00
e7213fdb7e
Remove project specific settings
2015-12-13 16:41:37 +13:00
09f7a03444
Quick changes to improve things.
2015-12-06 20:00:22 -05:00
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
AlexTheCoder
cnr
xGamingDudex
Alex-The-Coder
samczsun
LCastr0
Ben
Jonathan Williams
phobia
libraryaddict
Cheese
Shaun Bennett
md_5
Mysticate
Shaun Bennett