8e0c9aee38
Merge branch 'master' into dev
2013-11-27 14:39:34 -07:00
191c2c183f
Add a Thanksgiving check for eating cooked chicken.
2013-11-27 14:14:51 -07:00
b242bfd49b
Forgot a DiabloDropsHook import.
2013-11-27 13:20:01 -07:00
a6b848777a
Merge branch 'master' into dev
2013-11-27 13:08:11 -07:00
12967289c8
Fix slowdowns with new fire mechanic system with Fire Resistant targets.
2013-11-27 13:07:29 -07:00
51d12f53e7
Added in DiabloDropsHook patch.
2013-11-27 12:06:32 -07:00
9e8c7b9a91
Add in more test commands for DiabloDropsHook. Added comments detailing
...
how they work. Added more details on the tiers in DiabloDropsHook.java.
2013-11-27 12:03:21 -07:00
ee564d496d
More Digger changes. Add in DiabloDropsHook API first implementation.
2013-11-27 11:46:59 -07:00
1ac4c6ea1a
Fix double '/jobs members' commands.
2013-11-27 10:40:24 -07:00
5f2bc1310f
Add missing generateLootChest() function.
2013-11-27 10:31:17 -07:00
972d217589
Remove duplicate openLootChest() function.
2013-11-27 10:29:56 -07:00
e05cdbe5cf
Merge branch 'master' into dev
2013-11-27 10:28:10 -07:00
bb0060b0ed
Add in ability to teleport to Town spawn locations.
2013-11-27 07:17:28 -07:00
b6a692c058
Fix to teleportation cost.
2013-11-26 23:35:56 -07:00
0d0d08d03c
Minor changes to teleportation formula. Still not solved.
2013-11-26 23:05:41 -07:00
25f10a7a46
Fix major crash issue with '/jobs members'. Added Scaling health with
...
the teleporting command. Baby zombies are much less frequent and now
drop loot sometimes.
2013-11-26 22:10:22 -07:00
9819405e9d
Add toLowerCase() to Pick up notifications.
2013-11-26 17:08:23 -07:00
bfeb976e89
Fix teleport issues.
2013-11-26 16:10:56 -07:00
60b158cede
Merge remote-tracking branch 'origin/master_event'
2013-11-26 16:07:47 -07:00
Nonoriri
b977e080be
Added four types of loot chests. Loot chest probabilities slightly
...
increased. Fixed a nullpointerexception caused by a missing
toLowerCase() call.
2013-11-26 17:46:41 -05:00
485bbf930b
Fixed places where toLowerCase() was not needed/ was missing.
2013-11-26 13:41:17 -07:00
1a70610120
Make Mob Spawners extremely difficult again.
2013-11-26 12:41:58 -07:00
65263a474e
Use offline version of getJobLv().
2013-11-26 12:31:52 -07:00
0e1fe37493
Fix to /jobs members. Meant to sort by level, not name.
2013-11-26 12:23:33 -07:00
0b98c8c74b
Fixes to '/jobs members' before official release.
2013-11-26 11:17:29 -07:00
9fdb87addb
Add in '/jobs members' command.
2013-11-26 10:47:26 -07:00
70a92aeaac
Remove all saveAccountsConfig() calls. Add in 30 second account save
...
config. Should reduce a lot of stress on the server when players are
grinding jobs. There should be no reason to write to a file so often.
2013-11-26 10:17:23 -07:00
6f05142cc6
Merge branch 'master' into masterdev
...
Conflicts:
BankEconomyMod/src/me/kaZep/Base/Main.java
2013-11-26 06:54:32 -07:00
ac7fb86fb1
Merge branch 'master' into dev
...
Conflicts:
BankEconomyMod/src/me/kaZep/Base/Main.java
BankEconomyMod/src/me/kaZep/Base/PlayerListener.java
2013-11-26 06:53:42 -07:00
3ff7004716
Make anvil sounds play globally.
2013-11-26 06:41:42 -07:00
cbbbd87f15
Added '\n' to ItemSet descriptions to differentiate new lines.
2013-11-26 06:39:00 -07:00
8c668fccc1
Add in new ItemSet references.
2013-11-26 06:08:51 -07:00
00fc5c4baa
Apply Thanksgiving / Crafting Items Patch
2013-11-26 03:41:14 -07:00
f2e6ac0ca9
Fix duplicate method error.
2013-11-26 03:28:17 -07:00
c3e762d89e
Merge branch 'masterdev' into dev
...
Conflicts:
BankEconomyMod/src/me/kaZep/Base/Main.java
2013-11-26 03:21:19 -07:00
fb45458428
Add in configuration compatibility default for "thanksgiving-enabled"
...
and increase rain chance during Thanksgiving event.
2013-11-26 03:14:30 -07:00
97456967fc
Add in framework for Item Sets.
2013-11-26 03:01:33 -07:00
Nonoriri
53267fadcf
Thanksgiving event added. Use /event thanksgiving to toggle. Eggs give a
...
small amount of XP when thrown and generate a random item. Cooked
chicken (turkey) gives speed, saturation, and health boost for 15
minutes. Monsters have a small (0.5%) chance of dropping loot chests.
Loot chests contain a single random item equivalent to boss loot.
2013-11-26 02:11:34 -05:00
Nonoriri
64fb7e6e02
Added recipe for crafting a nether star from wither skeleton skulls,
...
using an existing nether star, soul sand, and diamonds. Added recipe for
crafting water source blocks using buckets and a nether star. Added
pocket crafting table.
2013-11-25 20:56:53 -05:00
53bfd54fb3
Merge branch 'master' into dev
2013-11-25 03:49:34 -07:00
df4a0b905a
Revert "Fire modifications. Move of tick code."
...
This reverts commit 35c249bc8fd3861966df8794126c3638ba7fdb2b.
2013-11-25 03:49:12 -07:00
b9d1039844
Add in new fire mechanics. Increase Recycling Center numbers.
2013-11-25 03:47:40 -07:00
35c249bc8f
Fire modifications. Move of tick code.
2013-11-25 03:29:50 -07:00
28255ca10a
Push changes for anvil.
2013-11-25 00:30:47 -07:00
0a4bde3866
Merge branch 'master' into dev
...
Conflicts:
BankEconomyMod/src/me/kaZep/Base/PlayerListener.java
2013-11-24 21:07:46 -07:00
Nonoriri
61ed29266b
Fixed a bug that was making the application of item bonuses cost less XP
...
than intended.
2013-11-24 19:39:20 -05:00
Nonoriri
ca8de45ef8
Fixed Trader's Enchanted Books not being properly multiplied.
2013-11-24 16:53:56 -05:00
Nonoriri
52dc2d0e7a
Fixed a merging error that somehow slipped through. Disenchanting will
...
now properly keep items a percentage of the time.
2013-11-24 16:14:42 -05:00
Nonoriri
6a152d0204
Fixed error due to getEnchantmentNumb being called for halloween item
...
lore.
2013-11-24 14:07:47 -05:00
Nonoriri
8007ddb83e
Fixed leather armor being not disenchantable due to LeatherArmorMeta
...
being a separate class that cannot be applied to enchanted books.
2013-11-24 13:23:48 -05:00
