Shaun Bennett
4f2d861b21
Fix chat bug, enable TablistFix for clans
2015-08-27 14:53:52 -07:00
Ty Sayers
783f526b76
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
2015-08-27 14:42:41 -07:00
Ty Sayers
4dcd54a9b0
Fix bug with DisguiseManager not properly handling the undisguising of non-player entities. Fix bug where FleshHook skill could be activated on players in a safe zone. Fix multiple bugs with unsafe logging system and NPC drops. Fix bug where unsafe timers and combat tagging in safe zones was not properly functioning. Fix bug with CustomGear not properly spawning with command. Add Clan Blacklist that restricts naming of Clans.
2015-08-27 14:42:07 -07:00
Shaun Bennett
e86bca99fd
Clans Chat
2015-08-27 14:33:50 -07:00
Shaun Bennett
b0ee2bb669
Fix purple/black item bug, fix clans/ally chat bug with no clan, murder changes, drop player gold as items on death, add lore to crafted items
2015-08-27 13:57:57 -07:00
Shaun Bennett
adfc451e9f
You can only repair items two times, ClansAdmin commands now require admin, Fix durability bug, Fix potion effects making inventory shift
2015-08-27 09:33:44 -07:00
Shaun Bennett
a5400b0fef
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-08-26 18:35:20 -07: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
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
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
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
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
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
libraryaddict
39ede2064a
Bosses game progress
2015-08-21 16:12:26 +12:00
libraryaddict
1e14d29999
Clans: Migrate bosses to combat core, fix map to rotate its cursor, finished golem?
2015-08-17 21:04:26 +12:00
libraryaddict
81f793d693
Iron Wizard: Commit progress
2015-08-14 20:49:17 +12:00
Shaun Bennett
2305e8bbaa
Store Kills, Deaths, Murders, Wins, Losses in database
...
Add Murder
2015-07-29 01:48:49 -05:00
Ty Sayers
13f47ad903
Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/CustomItem.java
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
2015-07-24 13:59:01 -05:00
Ty Sayers
0b49d053fe
Fix memory leak in player gear management. Update custom gear display design for title and description to fit CJ's specified design, as well as updating attribute descriptions to match google doc more closely. Fix bug with damage reduction attributes adding instead of reducing damage. Fix bug with parse errors causing defective attribute bugs and console spam with certain custom gear attributes. Fix bug where legend was not being properly displayed for /c map command. Fix bug where chunks could be claimed diagonally to opposing enemy clans. Fix bug with redstone not properly being disabled. Fix bug with attribute effects taking place even when damage events were cancelled, such as in safe zones. Fix bug with dispensers being able to place lava and water blocks. Fix bug where holding a book caused debug chat spam for players in regards to custom damage events.
2015-07-20 15:57:57 -05:00
libraryaddict
cd55eba2be
Clans: Fix map inventory moving
2015-07-21 07:37:08 +12:00
Jonathan Williams
0772f2e91e
Fixes for GoldManager
2015-07-19 21:04:59 -07:00
Jonathan Williams
3b47b01aea
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-07-19 20:18:08 -07:00
Jonathan Williams
73aea85876
GoldManager now uses stored procedure.
...
Deductions automatically process gold queue and return if transaction succeeded.
2015-07-19 19:32:46 -07:00
Jonathan Williams
3660b348cd
Work on Gold.
2015-07-19 18:15:50 -07:00
Shaun Bennett
1ef6fe3ed6
Observer changes
2015-07-17 15:37:33 -05:00
libraryaddict
3dcf489ea6
Add 'clan' to the clans command
2015-07-17 17:12:44 +12:00
Shaun Bennett
2b2e5e5c97
Spelling fixes + Observer mode
2015-07-16 15:51:21 -05:00
libraryaddict
c79117f86a
Merge branch 'clans/world-events' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events
2015-07-17 00:30:54 +12:00
libraryaddict
aaee5f01ce
Clans: Modifications to map stuff, fix food level depleting too fast
2015-07-17 00:30:34 +12:00
Jonathan Williams
9cf4ff005a
Added some debug checks.
2015-07-16 01:26:38 -05:00
Shaun Bennett
6a598690b0
Jooq Update, Async Clans calls, Clan name in scoreboard, block toss fix
2015-07-15 21:43:35 -05:00
Shaun Bennett
7f98157890
More work/fixes
2015-07-14 20:38:30 -05:00
Shaun Bennett
ae71de30db
Fixes and changes
2015-07-14 01:57:53 -05:00
Shaun Bennett
5c5e7dd4a9
Merge master into clans
2015-07-13 20:42:10 -05:00
Shaun Bennett
231d4bd494
Merge remote-tracking branch 'origin/clans/world-events' into clans/world-events
2015-07-13 20:23:51 -05:00
Shaun Bennett
dc1fe5fc2c
Fix schematic material id bug, add new schematics from build team, fix field ore bug, make /gear admin+, enable server join for staff ranks, remove annoying log spam from VisibilityManager
2015-07-13 19:11:17 -05:00
