Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix proposal for Fabricators-of-Create/Create#1096 #64

Closed
wants to merge 15 commits into from
Closed

Fix proposal for Fabricators-of-Create/Create#1096 #64

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
50b3751
Attempt fix of Fabricators-of-Create/Create#1096
fabien-gigante Oct 12, 2023
a7ebcbf
Temp debug trace statements in EntityMixin.java
fabien-gigante Oct 12, 2023
e231aea
Update EntityMixin.java
fabien-gigante Oct 12, 2023
98fe713
Update EntityMixin.java
fabien-gigante Oct 12, 2023
a498beb
Update EntityMixin.java
fabien-gigante Oct 12, 2023
cbb4f53
Update EntityMixin.java
fabien-gigante Oct 12, 2023
5e58628
Update EntityMixin.java
fabien-gigante Oct 12, 2023
ad4b628
Update EntityMixin.java
fabien-gigante Oct 12, 2023
7a2f8ab
Update EntityMixin.java
fabien-gigante Oct 12, 2023
c707eef
Update EntityMixin.java
fabien-gigante Oct 12, 2023
2f1b68a
Update EntityMixin.java
fabien-gigante Oct 12, 2023
f415be4
Update EntityMixin.java
fabien-gigante Oct 12, 2023
046bdbc
Update EntityMixin.java
fabien-gigante Oct 12, 2023
45256b1
Update EntityMixin.java
fabien-gigante Oct 12, 2023
8ec0fc7
Update EntityMixin.java
fabien-gigante Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions ...y/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/EntityMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ private Packet<ClientGamePacketListener> useExtendedSpawnPacket(Packet<ClientGam

@Unique
private List<ItemEntity> capturedDrops = null;
@Unique
private int capturedDropsCount = 0;

@WrapWithCondition(
method = "spawnAtLocation(Lnet/minecraft/world/item/ItemStack;F)Lnet/minecraft/world/entity/item/ItemEntity;",
Expand All @@ -111,7 +113,8 @@ public boolean captureDroppedItem(Level level, Entity entity) {

@Override
public void startCapturingDrops() {
capturedDrops = new ArrayList<>();
if (capturedDrops == null) capturedDrops = new ArrayList<ItemEntity>();
capturedDropsCount++;
}

@Override
Expand All @@ -122,7 +125,8 @@ public List<ItemEntity> getCapturedDrops() {
@Override
public List<ItemEntity> finishCapturingDrops() {
List<ItemEntity> captured = capturedDrops;
capturedDrops = null;
if (capturedDropsCount > 0) capturedDropsCount--;
if (capturedDropsCount == 0) capturedDrops = null;
return captured;
}

Expand Down