Skip to content

Commit

Permalink
maybe fixed 767
Browse files Browse the repository at this point in the history
  • Loading branch information
Luke100000 committed Oct 31, 2023
1 parent 319f4f8 commit 394b089
Show file tree
Hide file tree
Showing 7 changed files with 81 additions and 5 deletions.
1 change: 1 addition & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
* The editor now tells you if an incompatible mod disabled custom models
* Removed vanilla mechanics for turning villagers into zombie villagers as this causes undefined behavior
* Added HSV hair color option to editor
* Added loot tables in case mods rely on them and let zombie villagers drop some flesh

# 7.5.9

Expand Down
8 changes: 3 additions & 5 deletions common/src/main/java/net/mca/entity/GrimReaperEntity.java
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,9 @@ public boolean isValidPosition(BlockPos pos) {
@Override
protected void dropEquipment(DamageSource source, int lootingLvl, boolean hitByPlayer) {
super.dropEquipment(source, lootingLvl, hitByPlayer);
ItemEntity itementity = dropItem(ItemsMCA.SCYTHE.get());
if (itementity != null) {
itementity.setCovetedItem();
ItemEntity itemEntity = dropItem(ItemsMCA.SCYTHE.get());
if (itemEntity != null) {
itemEntity.setCovetedItem();
}
}

Expand All @@ -151,8 +151,6 @@ public void setAttackState(ReaperAttackState state) {
switch (state) {
case PRE -> playSound(SoundsMCA.REAPER_SCYTHE_OUT.get(), 1, 1);
case POST -> playSound(SoundsMCA.REAPER_SCYTHE_SWING.get(), 1, 1);
default -> {
}
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"type": "minecraft:entity"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"type": "minecraft:entity",
"pools": [
{
"bonus_rolls": 0.0,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"add": false,
"count": {
"type": "minecraft:uniform",
"max": 2.0,
"min": 0.0
},
"function": "minecraft:set_count"
},
{
"count": {
"type": "minecraft:uniform",
"max": 1.0,
"min": 0.0
},
"function": "minecraft:looting_enchant"
}
],
"name": "minecraft:rotten_flesh"
}
],
"rolls": 1
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"type": "minecraft:entity"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"type": "minecraft:entity"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"type": "minecraft:entity",
"pools": [
{
"bonus_rolls": 0.0,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"add": false,
"count": {
"type": "minecraft:uniform",
"max": 2.0,
"min": 0.0
},
"function": "minecraft:set_count"
},
{
"count": {
"type": "minecraft:uniform",
"max": 1.0,
"min": 0.0
},
"function": "minecraft:looting_enchant"
}
],
"name": "minecraft:rotten_flesh"
}
],
"rolls": 1
}
]
}

0 comments on commit 394b089

Please sign in to comment.