fixes #234
This commit is contained in:
1 parent
56749f731a
commit
d56706b133
3 files changed
+7
-7
No files matched your search
@@ -2,6 +2,6 @@ package carpet.fakes;
|
|||||||
|
|
||||||
public interface ItemEntityInterface
|
public interface ItemEntityInterface
|
||||||
{
|
{
|
||||||
int getAge();
|
int getAgeCM();
|
||||||
int getPickupDelay();
|
int getPickupDelayCM();
|
||||||
}
|
}
|
||||||
@@ -30,12 +30,12 @@ public abstract class ItemEntityMixin extends Entity implements ItemEntityInterf
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getAge() {
|
public int getAgeCM() {
|
||||||
return this.age;
|
return this.age;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getPickupDelay() {
|
public int getPickupDelayCM() {
|
||||||
return this.pickupDelay;
|
return this.pickupDelay;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -91,8 +91,8 @@ public abstract class ItemEntityMixin extends Entity implements ItemEntityInterf
|
|||||||
selfStack.increment(amount);
|
selfStack.increment(amount);
|
||||||
self.setStack(selfStack);
|
self.setStack(selfStack);
|
||||||
|
|
||||||
this.pickupDelay = Math.max(((ItemEntityInterface)other).getPickupDelay(), this.pickupDelay);
|
this.pickupDelay = Math.max(((ItemEntityInterface)other).getPickupDelayCM(), this.pickupDelay);
|
||||||
this.age = Math.min(((ItemEntityInterface)other).getAge(), this.age);
|
this.age = Math.min(((ItemEntityInterface)other).getAgeCM(), this.age);
|
||||||
|
|
||||||
otherStack.decrement(amount);
|
otherStack.decrement(amount);
|
||||||
if (otherStack.isEmpty())
|
if (otherStack.isEmpty())
|
||||||
|
|||||||
@@ -254,7 +254,7 @@ public class EntityValue extends Value
|
|||||||
put("despawn_timer", (e, a) -> e instanceof LivingEntity?new NumericValue(((LivingEntity) e).getDespawnCounter()):Value.NULL);
|
put("despawn_timer", (e, a) -> e instanceof LivingEntity?new NumericValue(((LivingEntity) e).getDespawnCounter()):Value.NULL);
|
||||||
put("item", (e, a) -> (e instanceof ItemEntity)?ListValue.fromItemStack(((ItemEntity) e).getStack()):Value.NULL);
|
put("item", (e, a) -> (e instanceof ItemEntity)?ListValue.fromItemStack(((ItemEntity) e).getStack()):Value.NULL);
|
||||||
put("count", (e, a) -> (e instanceof ItemEntity)?new NumericValue(((ItemEntity) e).getStack().getCount()):Value.NULL);
|
put("count", (e, a) -> (e instanceof ItemEntity)?new NumericValue(((ItemEntity) e).getStack().getCount()):Value.NULL);
|
||||||
put("pickup_delay", (e, a) -> (e instanceof ItemEntity)?new NumericValue(((ItemEntityInterface) e).getPickupDelay()):Value.NULL);
|
put("pickup_delay", (e, a) -> (e instanceof ItemEntity)?new NumericValue(((ItemEntityInterface) e).getPickupDelayCM()):Value.NULL);
|
||||||
// ItemEntity -> despawn timer via ssGetAge
|
// ItemEntity -> despawn timer via ssGetAge
|
||||||
put("is_baby", (e, a) -> (e instanceof LivingEntity)?new NumericValue(((LivingEntity) e).isBaby()):Value.NULL);
|
put("is_baby", (e, a) -> (e instanceof LivingEntity)?new NumericValue(((LivingEntity) e).isBaby()):Value.NULL);
|
||||||
put("target", (e, a) -> {
|
put("target", (e, a) -> {
|
||||||
|
|||||||
Reference in new issue
Block a user