Skip to content

Commit c03c957

Browse files
authored
Fix setting passengers performs mount logic (#3565)
Fixes #3492 Fixes #3493
1 parent 37b8f5a commit c03c957

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

src/accessors/java/org/spongepowered/common/accessor/world/entity/EntityAccessor.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ public interface EntityAccessor {
9191

9292
@Accessor("portalEntrancePos") void accessor$portalEntrancePos(final BlockPos portalEntrancePos);
9393

94-
@Accessor("passengers") List<Entity> accessor$passengers();
95-
9694
@Invoker("setRot") void invoker$setRot(final float yRot, final float xRot);
9795

9896
@Invoker("getEncodeId") @Nullable String invoker$getEncodeId();

src/main/java/org/spongepowered/common/data/provider/entity/EntityData.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,8 @@ public static void register(final DataProviderRegistrator registrator) {
169169
.create(Keys.PASSENGERS)
170170
.get(h -> h.getPassengers().stream().map(org.spongepowered.api.entity.Entity.class::cast).collect(Collectors.toList()))
171171
.set((h, v) -> {
172-
((EntityAccessor) h).accessor$passengers().clear();
173-
v.forEach(v1 -> ((EntityAccessor) h).accessor$passengers().add((Entity) v1));
172+
h.ejectPassengers();
173+
v.forEach(v1 -> ((Entity) v1).startRiding(h, true));
174174
})
175175
.create(Keys.REMAINING_AIR)
176176
.get(h -> Math.max(0, h.getAirSupply()))

0 commit comments

Comments
 (0)