Skip to content

Commit 4f262ba

Browse files
committed
Fix SpawnEntityEvent list mutability
1 parent 7eba30d commit 4f262ba

File tree

7 files changed

+10
-14
lines changed

7 files changed

+10
-14
lines changed

src/main/java/org/spongepowered/common/event/tracking/IPhaseState.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
*/
2525
package org.spongepowered.common.event.tracking;
2626

27-
import com.google.common.collect.ImmutableList;
2827
import net.minecraft.core.BlockPos;
2928
import net.minecraft.server.level.ServerLevel;
3029
import net.minecraft.server.level.ServerPlayer;
@@ -372,7 +371,7 @@ default Supplier<SpawnType> getSpawnTypeForTransaction(final C context, final En
372371

373372
default SpawnEntityEvent createSpawnEvent(final C context,
374373
final @Nullable GameTransaction<@NonNull ?> parent,
375-
final ImmutableList<Entity> collect,
374+
final List<Entity> collect,
376375
final Cause currentCause
377376
) {
378377
return SpongeEventFactory.createSpawnEntityEvent(currentCause, (List) collect);

src/main/java/org/spongepowered/common/event/tracking/PhaseStateProxy.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
*/
2525
package org.spongepowered.common.event.tracking;
2626

27-
import com.google.common.collect.ImmutableList;
2827
import net.minecraft.core.BlockPos;
2928
import net.minecraft.server.level.ServerLevel;
3029
import net.minecraft.server.level.ServerPlayer;
@@ -287,7 +286,7 @@ default Supplier<SpawnType> getSpawnTypeForTransaction(final Entity entityToSpaw
287286
}
288287

289288
default SpawnEntityEvent createSpawnEvent(final @Nullable GameTransaction<@NonNull ?> parent,
290-
final ImmutableList<Entity> collect,
289+
final List<Entity> collect,
291290
final Cause currentCause
292291
) {
293292
return this.getState().createSpawnEvent(this.asContext(), parent, collect, currentCause);

src/main/java/org/spongepowered/common/event/tracking/context/transaction/world/SpawnEntityTransaction.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,12 @@
4444
import org.spongepowered.common.event.tracking.context.transaction.type.TransactionTypes;
4545
import org.spongepowered.common.util.PrettyPrinter;
4646

47+
import java.util.List;
4748
import java.util.Optional;
4849
import java.util.StringJoiner;
4950
import java.util.function.BiConsumer;
5051
import java.util.function.Supplier;
52+
import java.util.stream.Collectors;
5153
import java.util.stream.Stream;
5254

5355
@DefaultQualifier(NonNull.class)
@@ -102,9 +104,9 @@ public Optional<SpawnEntityEvent> generateEvent(
102104
final @Nullable GameTransaction<@NonNull ?> parent,
103105
final ImmutableList<GameTransaction<SpawnEntityEvent>> gameTransactions, final Cause currentCause
104106
) {
105-
final ImmutableList<Entity> collect = gameTransactions.stream()
107+
final List<Entity> collect = gameTransactions.stream()
106108
.map(transaction -> ((SpawnEntityTransaction) transaction).entityToSpawn)
107-
.collect(ImmutableList.toImmutableList());
109+
.collect(Collectors.toList());
108110
return Optional.of(context.createSpawnEvent(parent, collect, currentCause));
109111
}
110112

src/main/java/org/spongepowered/common/event/tracking/phase/general/ExplosionState.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
*/
2525
package org.spongepowered.common.event.tracking.phase.general;
2626

27-
import com.google.common.collect.ImmutableList;
2827
import net.minecraft.world.entity.Entity;
2928
import net.minecraft.world.entity.LivingEntity;
3029
import net.minecraft.world.level.Explosion;
@@ -100,7 +99,7 @@ public void unwind(final ExplosionContext context) {
10099
public SpawnEntityEvent createSpawnEvent(
101100
final ExplosionContext context,
102101
final @Nullable GameTransaction<@NonNull ?> parent,
103-
final ImmutableList<Entity> collect,
102+
final List<Entity> collect,
104103
final Cause currentCause
105104
) {
106105
if (parent instanceof ChangeBlock) {

src/main/java/org/spongepowered/common/event/tracking/phase/packet/inventory/CloseWindowState.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
*/
2525
package org.spongepowered.common.event.tracking.phase.packet.inventory;
2626

27-
import com.google.common.collect.ImmutableList;
2827
import net.minecraft.world.entity.Entity;
2928
import org.checkerframework.checker.nullness.qual.NonNull;
3029
import org.checkerframework.checker.nullness.qual.Nullable;
@@ -54,7 +53,7 @@ public Supplier<SpawnType> getSpawnTypeForTransaction(final CloseWindowContext c
5453

5554
@Override
5655
public SpawnEntityEvent createSpawnEvent(final CloseWindowContext context, final @Nullable GameTransaction<@NonNull ?> parent,
57-
final ImmutableList<Entity> collect, final Cause currentCause) {
56+
final List<Entity> collect, final Cause currentCause) {
5857
return SpongeEventFactory.createDropItemEventClose(currentCause, (List) collect);
5958
}
6059
}

src/main/java/org/spongepowered/common/event/tracking/phase/packet/inventory/DropInventoryState.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
*/
2525
package org.spongepowered.common.event.tracking.phase.packet.inventory;
2626

27-
import com.google.common.collect.ImmutableList;
2827
import org.checkerframework.checker.nullness.qual.NonNull;
2928
import org.spongepowered.api.event.Cause;
3029
import org.spongepowered.api.event.CauseStackManager;
@@ -55,7 +54,7 @@ public BiConsumer<CauseStackManager.StackFrame, InventoryPacketContext> getFrame
5554
@Override
5655
public SpawnEntityEvent createSpawnEvent(
5756
final InventoryPacketContext context, final GameTransaction<@NonNull ?> parent,
58-
final ImmutableList<net.minecraft.world.entity.Entity> collect,
57+
final List<net.minecraft.world.entity.Entity> collect,
5958
final Cause currentCause
6059
) {
6160
return SpongeEventFactory.createDropItemEventDispense(currentCause, (List) collect);

src/main/java/org/spongepowered/common/event/tracking/phase/packet/player/PacketCommandState.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
*/
2525
package org.spongepowered.common.event.tracking.phase.packet.player;
2626

27-
import com.google.common.collect.ImmutableList;
2827
import net.minecraft.world.entity.Entity;
2928
import org.checkerframework.checker.nullness.qual.NonNull;
3029
import org.spongepowered.api.block.transaction.BlockTransactionReceipt;
@@ -83,7 +82,7 @@ public void postBlockTransactionApplication(
8382
@Override
8483
public SpawnEntityEvent createSpawnEvent(
8584
final PlayerCommandPhaseContext context, final GameTransaction<@NonNull ?> parent,
86-
final ImmutableList<Entity> collect, final Cause currentCause
85+
final List<Entity> collect, final Cause currentCause
8786
) {
8887
final Cause newCauseWithSpawnType = Cause.builder().from(currentCause).build(
8988
EventContext.builder().from(currentCause.context()).add(

0 commit comments

Comments
 (0)