SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.21.5

Browse Source 
Co-authored-by: Bjarne Koll <git@lynxplay.dev>
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
Co-authored-by: MiniDigger | Martin <admin@minidigger.dev>
Co-authored-by: Nassim Jahnke <nassim@njahnke.dev>
Co-authored-by: Noah van der Aa <ndvdaa@gmail.com>
Co-authored-by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
Co-authored-by: Shane Freeder <theboyetronic@gmail.com>
Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
Co-authored-by: Tamion <70228790+notTamion@users.noreply.github.com>
Co-authored-by: Warrior <50800980+Warriorrrr@users.noreply.github.com>
This commit is contained in:
Nassim Jahnke
2025-04-12 17:26:44 +02:00
parent 0767902699
commit f00727c57e
2092 changed files with 50551 additions and 48729 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
paper-server/src/main/java/org/bukkit/craftbukkit/CraftRaid.java
View File

@@ -11,16 +11,17 @@ import net.minecraft.core.BlockPos;
import net.minecraft.world.level.Level;
import org.bukkit.Location;
import org.bukkit.Raid;
import org.bukkit.Raid.RaidStatus;
import org.bukkit.craftbukkit.util.CraftLocation;
import org.bukkit.entity.Raider;
public final class CraftRaid implements Raid {
private final net.minecraft.world.entity.raid.Raid handle;
private final Level level;
public CraftRaid(net.minecraft.world.entity.raid.Raid handle) {
public CraftRaid(net.minecraft.world.entity.raid.Raid handle, Level level) {
this.handle = handle;
this.level = level;
}
@Override
@@ -48,8 +49,7 @@ public final class CraftRaid implements Raid {
@Override
public Location getLocation() {
BlockPos pos = this.handle.getCenter();
Level world = this.handle.getLevel();
return CraftLocation.toBukkit(pos, world.getWorld());
return CraftLocation.toBukkit(pos, this.level.getWorld());
}
@Override
@@ -104,10 +104,9 @@ public final class CraftRaid implements Raid {
return this.handle;
}
// Paper start - more Raid API
@Override
public int getId() {
return this.handle.getId();
return this.handle.idOrNegativeOne;
}
@Override
@@ -132,5 +131,4 @@ public final class CraftRaid implements Raid {
public int hashCode() {
return this.handle.hashCode();
}
// Paper end - more Raid API
}