Ty Sayers
6442ec4c2a
Merge pull request #42 in MIN/mineplex from clans_custom_gear to clans-beta
...
* commit 'c20d2c9516a04927b45686f301e0ea75050549e6':
Fix bug with economy gold additions/reductions not properly working and causing shops to fail. Fix bug with region resetting command and streamline the claiming of server-based faction chunks for Spawn, Shops, Fields and Borderlands.
Left-over commit from last update to add new /region-reset command.
Add new /region-reset command to reset and re-claim all admin-based regions such as Spawn, Shops, Borderlands, and Fields.
Increase spawn safe-zone radius by one chunk and shift east shop location one chunk over to fit with the map.
Fix bug where NPCs were unable to spawn into safe zones. Remove Shield Smash skill from Clans.
2015-08-26 19:38:58 -05:00
Ty Sayers
c20d2c9516
Fix bug with economy gold additions/reductions not properly working and causing shops to fail. Fix bug with region resetting command and streamline the claiming of server-based faction chunks for Spawn, Shops, Fields and Borderlands.
2015-08-26 17:37:31 -07:00
Shaun Bennett
669de4c91d
Change EntitySpawnEvent to CreatureSpawnEvent
2015-08-26 16:44:39 -07:00
Shaun Bennett
e4c48e5f3f
Merge remote-tracking branch 'remotes/origin/clans_custom_gear' into clans-beta
2015-08-26 15:01:44 -07:00
Shaun Bennett
e85682d68f
Use proper item names for recipes, don't allow repairing items more than two times
2015-08-26 14:56:28 -07:00
Ty Sayers
62ffdc1ef1
Left-over commit from last update to add new /region-reset command.
2015-08-26 14:54:33 -07:00
Ty Sayers
3b999d2660
Add new /region-reset command to reset and re-claim all admin-based regions such as Spawn, Shops, Borderlands, and Fields.
2015-08-26 14:54:15 -07:00
Shaun Bennett
0dd79419eb
Update schematic files
2015-08-26 13:39:13 -07:00
Shaun Bennett
e6c4227a4f
Merge remote-tracking branch 'remotes/origin/clans_custom_gear' into clans-beta
2015-08-26 13:30:02 -07:00
Ty Sayers
fc5f57803e
Increase spawn safe-zone radius by one chunk and shift east shop location one chunk over to fit with the map.
2015-08-26 13:29:22 -07:00
Ty Sayers
c3013063de
Fix bug where NPCs were unable to spawn into safe zones. Remove Shield Smash skill from Clans.
2015-08-26 13:09:10 -07:00
Shaun Bennett
14f5cb4704
Allow breaking/placing blocks when in creative
2015-08-26 13:09:01 -07:00
Mysticate
a351a8f1ed
Minor improvements.
2015-08-26 13:47:01 -06:00
Shaun Bennett
7a66a8dad9
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-08-26 12:26:35 -07:00
Shaun Bennett
b13c9fe227
Field updates, War updates, bug fixes
2015-08-26 12:26:27 -07:00
Ty Sayers
12d479391e
Merge pull request #41 in MIN/mineplex from clans_custom_gear to clans-beta
...
* commit '52911b953433814afb0dee0fb320431d6d102489':
Fix bug with players being able to pick up water and lava sources with empty buckets. Fix bug where death animation wasn't properly playing on entities that entered a safe zone. Increase hunger decay rate slightly. Swap the locations for Shop and Spawn zones and fix appropriate radius differences for zones.
2015-08-26 14:25:53 -05:00
Ty Sayers
52911b9534
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
2015-08-26 12:24:02 -07:00
Ty Sayers
9a45d1116a
Fix bug with players being able to pick up water and lava sources with empty buckets. Fix bug where death animation wasn't properly playing on entities that entered a safe zone. Increase hunger decay rate slightly. Swap the locations for Shop and Spawn zones and fix appropriate radius differences for zones.
2015-08-26 12:22:36 -07:00
Mysticate
cfdb0dfa4f
Added kits + achievements. Hurrah!
2015-08-26 13:19:17 -06:00
Mysticate
988382375f
Started adding kits
2015-08-25 23:36:18 -06:00
Shaun Bennett
062328313e
Fix errors
2015-08-24 22:24:26 -05:00
Jonathan Williams
61c80fd31d
Fixed issue with player login sessions.
2015-08-24 20:21:14 -07:00
Shaun Bennett
bf1f62057c
Merge remote-tracking branch 'remotes/origin/clans_custom_gear' into clans-beta
...
Conflicts:
Plugins/.idea/misc.xml
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
2015-08-24 22:15:08 -05:00
Shaun Bennett
6841cbac69
Clans bug fixes + shop updates
2015-08-24 22:03:26 -05:00
Jonathan Williams
b64a75cbf3
Added maintenance message.
2015-08-24 18:35:11 -07:00
Ty Sayers
69afefd66f
Merge branch 'clans/world-events' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/blockrestore/BlockRestoreMap.java
Additionally, fix bug where players could fish hook to combat-tag a player in spawn and then attack them. Fix issue where players were able to empty lava and water buckets. Fix bug where monsters wandered into and around spawn zones. Fix bugs where special abilities FireBlast, ExplosiveShot, and WolfsPounce were not affecting mobs (only players). Fix bug with soup left-click punch activation not fully integrated.
2015-08-24 20:55:29 -04:00
Mysticate
7b42f2155d
Tweaks. :D
2015-08-24 20:40:34 -04:00
fooify
549435224f
changes to monster maze!
2015-08-24 09:58:07 -07:00
libraryaddict
ba41118da7
Load boss battles properly
2015-08-25 01:58:57 +12:00
Mini-Chiss
6249dadf91
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-23 16:27:47 -07:00
Jonathan Williams
6d3c965f14
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-23 16:26:02 -07:00
Jonathan Williams
74fd729975
Updated BungeeCord to latest version.
2015-08-23 15:48:03 -07:00
Jonathan Williams
8ca2b8537c
Fixed Logging of gems/coins for support staff.
2015-08-23 15:47:41 -07:00
Jonathan Williams
fec8398608
UPdated ChestConverter to convert stats.
2015-08-23 15:47:03 -07:00
Jonathan Williams
34a5d9c722
Updated MotdManager to update both repositories.
2015-08-23 15:46:23 -07:00
Jonathan Williams
1e7f2f01a7
Fixed problem where UUID api was preventing client loading from db.
2015-08-23 15:38:43 -07:00
libraryaddict
8798244351
Bosses stuff
2015-08-24 08:34:29 +12:00
Mini-Chiss
d454d73ccb
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-23 11:32:48 -07:00
Mini-Chiss
69ff514bf8
changed perms on write
2015-08-23 11:31:32 -07:00
Ty Sayers
a9f5197c64
Merge branch 'clans/world-events' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
Plugins/Mineplex.Database/src/mineplex/database/Account.java
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java
2015-08-22 15:18:51 -04:00
Ty Sayers
6c9a99fa1b
Fix soup consumption bug that didn't allow left clicking for use. Fix bug with item frames being destroyed inside spawn zones. Fix bug with bow deficient classes not properly receiving damage reductions on their bow attacks. Fix bug with Whirlwind Axe skill being enabled in Clans settings. Fix bug where bank related shop buttons functioned as gold token purchasables for error-displaying icons. Increasing duration on potion application from custom gear to prevent shaking inventory screen. Fix bug with gold balance changes (add/remove) weren't taking place synchronously, leading to the ability for duplication of gold and items. Fix bug where enemy'd Clans could be allied or neutral'd, as well as signaling that at-war clans were neutral. Fix bug where clans could unclaim admin chunks and ally chunks. Decrease the rate at which hunger decreases to be more accordance with 1.6 food systems. Disable Flint & Steel, Enderpearls, and Witch spawning.
2015-08-22 15:06:05 -04:00
Mysticate
cbaaee60d9
Removed mob spectating method from evolving.
2015-08-21 13:00:08 -04:00
libraryaddict
cdc92f8b2f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-22 00:38:55 +12:00
libraryaddict
7841b17d03
Add PacketPlayOutCamera for locking view to entity
2015-08-22 00:38:37 +12:00
libraryaddict
2fe188ac0c
Merge pull request #39 in MIN/mineplex from DeadBodies to master
...
* commit 'bad339cf04ead2e63800b0bb41870b9df73ab4de':
Tweak dead bodies more
Dead bodies: Change to Item from disguised arrow, fix body positioning, move to Game.java to enable in all games
2015-08-21 03:54:17 -05:00
libraryaddict
bad339cf04
Tweak dead bodies more
2015-08-21 20:52:57 +12:00
libraryaddict
c41328d726
Dead bodies: Change to Item from disguised arrow, fix body positioning, move to Game.java to enable in all games
2015-08-21 20:40:09 +12:00
libraryaddict
39ede2064a
Bosses game progress
2015-08-21 16:12:26 +12:00
Mini-Chiss
63107b0c26
missing file
2015-08-20 20:39:20 +02:00
Mini-Chiss
15c873392a
updated give to allow naming of items.
2015-08-20 20:38:07 +02:00