Skip to content

Add natural passengers to the world using api #13560

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

Open
Lulu13022002 wants to merge 1 commit into
base: main
Choose a base branch
from
+1 −13
Open

Add natural passengers to the world using api #13560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions paper-server/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,12 +403,10 @@ public <T extends Entity> T addEntity(net.minecraft.world.entity.Entity entity,
function.accept((T) entity.getBukkitEntity());
}

this.addEntityToWorld(entity, reason);
this.addEntityWithPassengers(entity, reason);
return (T) entity.getBukkitEntity();
}

public abstract void addEntityToWorld(net.minecraft.world.entity.Entity entity, CreatureSpawnEvent.SpawnReason reason);

public abstract void addEntityWithPassengers(net.minecraft.world.entity.Entity entity, CreatureSpawnEvent.SpawnReason reason);

@SuppressWarnings("unchecked")
Expand Down
5 changes: 0 additions & 5 deletions paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -948,11 +948,6 @@ public Iterable<net.minecraft.world.entity.Entity> getNMSEntities() {
return this.getHandle().getEntities().getAll();
}

@Override
public void addEntityToWorld(net.minecraft.world.entity.Entity entity, SpawnReason reason) {
this.getHandle().addFreshEntity(entity, reason);
}

@Override
public void addEntityWithPassengers(net.minecraft.world.entity.Entity entity, SpawnReason reason) {
this.getHandle().tryAddFreshEntityWithPassengers(entity, reason);
Expand Down
5 changes: 0 additions & 5 deletions paper-server/src/main/java/org/bukkit/craftbukkit/generator/CraftLimitedRegion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,11 +261,6 @@ public <T extends Entity> T spawn(Location location, Class<T> clazz, Consumer<?
return super.spawn(location, clazz, function, reason);
}

@Override
public void addEntityToWorld(net.minecraft.world.entity.Entity entity, CreatureSpawnEvent.SpawnReason reason) {
this.entities.add(entity);
}

@Override
public void addEntityWithPassengers(net.minecraft.world.entity.Entity entity, CreatureSpawnEvent.SpawnReason reason) {
this.entities.add(entity);
Expand Down
Loading