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
libraryaddict
66bef4ac00
Maps: 100 deaths before maps freeze, sends a warning message when switching servers from clans
2015-07-13 21:21:17 +12:00
Shaun Bennett
a9e68ff777
Completed Energy
2015-07-08 21:39:31 -05:00
libraryaddict
27c7e7be03
Merge branch 'clans/world-events' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events
2015-07-04 09:07:29 +12:00
libraryaddict
fbf2935b19
Don't display dead players
2015-07-04 09:07:14 +12:00
Shaun Bennett
384d1814d7
Scoreboard teams display clan relationships
2015-07-03 15:12:46 -05:00
libraryaddict
c021c6cc19
Added missing but not forgotten MapCommand
2015-07-04 07:12:50 +12:00
libraryaddict
24294237ea
Add /map command
2015-07-04 04:11:35 +12:00
libraryaddict
89a4541275
If inventory is empty, add clans map
2015-07-04 04:09:18 +12:00
libraryaddict
c75f22b5e0
Merge branch 'clans/world-events' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2015-07-04 03:44:59 +12:00
libraryaddict
68f7bd533d
Clans Map stuff
2015-07-03 14:23:37 +12:00
Shaun Bennett
9ccc85a79e
Improved block restore for Events
2015-06-30 22:30:49 -05:00
Shaun Bennett
0fce46f504
Finished Undead Camp Event (Loot tables still need adjusting)
2015-06-30 15:28:50 -05:00
Shaun Bennett
0fdc4e0008
Merge remote-tracking branch 'origin/clans/world-events' into clans/world-events
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/event/undead/UndeadCamp.java
2015-06-30 14:04:35 -05:00
Shaun Bennett
be974bfaac
Work from laptop
2015-06-30 14:02:39 -05:00
Shaun Bennett
e0284e2eb0
Loot for World Events
2015-06-29 22:32:40 -05:00
Ty Sayers
d2f633f572
Fix attribute name positioning bug as well as duplicated attributes on randomly generated items. Fix misleading description of item attributes Conquering/Protection. Fix bug with unwanted entities spawning and targetting players in safe Spawn zones. Fix bug with WindBlade occasionally killing users via fall damage after a long flight even though close to the ground. Fix bug with MagneticBlade not properly pulling entities other than players. Fix bug with AlligatorsTooth not properly granting certain effects such as water breathing.
2015-06-29 16:38:51 -04:00
Shaun Bennett
d07c319581
Saving some work
2015-06-27 22:22:02 -05:00
Shaun Bennett
1865e41144
Undead Camp
2015-06-26 01:05:36 -05:00
