mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 15:49:00 +01:00
27 lines
1.8 KiB
Diff
27 lines
1.8 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: HexedHero <6012891+HexedHero@users.noreply.github.com>
|
||
|
|
Date: Fri, 23 Apr 2021 22:42:42 +0100
|
||
|
|
Subject: [PATCH] Expand PlayerRespawnEvent, fix passed parameter issues
|
||
|
|
|
||
|
|
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||
|
|
index 8afd1245316d9df8f1a1b45c669c9a8b7de77aa6..1cc771bfecc8d86d103879fbef28dbf993a7903e 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||
|
|
@@ -1197,7 +1197,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
|
||
|
|
Player respawnPlayer = this.getBukkitEntity();
|
||
|
|
Location location = CraftLocation.toBukkit(dimensionTransition.pos(), dimensionTransition.newLevel().getWorld(), dimensionTransition.yRot(), dimensionTransition.xRot());
|
||
|
|
|
||
|
|
- PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location, isBedSpawn, isAnchorSpawn, reason);
|
||
|
|
+ // Paper start - respawn flags
|
||
|
|
+ com.google.common.collect.ImmutableSet.Builder<org.bukkit.event.player.PlayerRespawnEvent.RespawnFlag> builder = com.google.common.collect.ImmutableSet.builder();
|
||
|
|
+ if (reason == org.bukkit.event.player.PlayerRespawnEvent.RespawnReason.END_PORTAL) {
|
||
|
|
+ builder.add(org.bukkit.event.player.PlayerRespawnEvent.RespawnFlag.END_PORTAL);
|
||
|
|
+ }
|
||
|
|
+ PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location, isBedSpawn, isAnchorSpawn, reason, builder);
|
||
|
|
+ // Paper end - respawn flags
|
||
|
|
this.level().getCraftServer().getPluginManager().callEvent(respawnEvent);
|
||
|
|
// Spigot Start
|
||
|
|
if (this.connection.isDisconnected()) {
|