fix more compile errors
This commit is contained in:
parent
72923817d6
commit
0f17027652
26 changed files with 130 additions and 111 deletions
|
@ -1226,10 +1226,10 @@ index a4411daca0d8a770b0d15e08847b82df8a3ec27f..35b51136f5258abfae3395aeae4b3000
|
|||
+ // Paper end - Entity API
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java b/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java
|
||||
index db69687a7ad4b18d17ab1677cae5d8dd4dcd3678..8e4c6ec409f49d4a3378c466acc47f62c7689c0b 100644
|
||||
index db69687a7ad4b18d17ab1677cae5d8dd4dcd3678..304b05aeaea5febf493fc40d433a23acb384b4f0 100644
|
||||
--- a/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java
|
||||
+++ b/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java
|
||||
@@ -24,4 +24,19 @@ public interface HopperMinecart extends Minecart, InventoryHolder, LootableEntit
|
||||
@@ -24,4 +24,23 @@ public interface HopperMinecart extends Minecart, InventoryHolder, LootableEntit
|
||||
* @param enabled new enabled state
|
||||
*/
|
||||
void setEnabled(boolean enabled);
|
||||
|
@ -1238,14 +1238,18 @@ index db69687a7ad4b18d17ab1677cae5d8dd4dcd3678..8e4c6ec409f49d4a3378c466acc47f62
|
|||
+ * Gets the number of ticks that this hopper minecart cannot pickup items up for.
|
||||
+ *
|
||||
+ * @return ticks left on cooldown
|
||||
+ * @deprecated Hopper minecarts don't have cooldowns anymore
|
||||
+ */
|
||||
+ @Deprecated(forRemoval = true)
|
||||
+ int getPickupCooldown();
|
||||
+
|
||||
+ /**
|
||||
+ * Sets the number of ticks that this hopper minecart cannot pickup items for.
|
||||
+ *
|
||||
+ * @param cooldown cooldown length in ticks
|
||||
+ * @deprecated Hopper minecarts don't have cooldowns anymore
|
||||
+ */
|
||||
+ @Deprecated(forRemoval = true)
|
||||
+ void setPickupCooldown(int cooldown);
|
||||
+ // Paper end
|
||||
}
|
||||
|
|
|
@ -219,7 +219,7 @@ index f3fe0266778d9d513f6a561b8829644d1f66e617..058c2f9da196d68477d5fbdcf55b5074
|
|||
@Override
|
||||
Spigot spigot();
|
||||
diff --git a/src/main/java/org/bukkit/event/player/PlayerTeleportEvent.java b/src/main/java/org/bukkit/event/player/PlayerTeleportEvent.java
|
||||
index 113e620ce38bb8ff97cf24e309af59b717774b36..cc75d2e84e68a1f63ec91a909c37407a46ddb16a 100644
|
||||
index 113e620ce38bb8ff97cf24e309af59b717774b36..c334684341002c469a0dd90fc995758aff6bac61 100644
|
||||
--- a/src/main/java/org/bukkit/event/player/PlayerTeleportEvent.java
|
||||
+++ b/src/main/java/org/bukkit/event/player/PlayerTeleportEvent.java
|
||||
@@ -13,8 +13,14 @@ public class PlayerTeleportEvent extends PlayerMoveEvent {
|
||||
|
@ -237,16 +237,14 @@ index 113e620ce38bb8ff97cf24e309af59b717774b36..cc75d2e84e68a1f63ec91a909c37407a
|
|||
}
|
||||
|
||||
public PlayerTeleportEvent(@NotNull final Player player, @NotNull final Location from, @Nullable final Location to, @NotNull final TeleportCause cause) {
|
||||
@@ -23,6 +29,17 @@ public class PlayerTeleportEvent extends PlayerMoveEvent {
|
||||
@@ -23,6 +29,15 @@ public class PlayerTeleportEvent extends PlayerMoveEvent {
|
||||
this.cause = cause;
|
||||
}
|
||||
|
||||
+ // Paper start - Teleport API
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental
|
||||
+ public PlayerTeleportEvent(@NotNull final Player player, @NotNull final Location from, @Nullable final Location to, @NotNull final TeleportCause cause, boolean dismounted, @NotNull java.util.Set<io.papermc.paper.entity.TeleportFlag.@NotNull Relative> teleportFlagSet) {
|
||||
+ public PlayerTeleportEvent(@NotNull final Player player, @NotNull final Location from, @Nullable final Location to, @NotNull final TeleportCause cause, @NotNull java.util.Set<io.papermc.paper.entity.TeleportFlag.@NotNull Relative> teleportFlagSet) {
|
||||
+ super(player, from, to);
|
||||
+
|
||||
+ this.dismounted = dismounted;
|
||||
+ this.teleportFlagSet = teleportFlagSet;
|
||||
+ this.cause = cause;
|
||||
+ }
|
||||
|
@ -255,7 +253,7 @@ index 113e620ce38bb8ff97cf24e309af59b717774b36..cc75d2e84e68a1f63ec91a909c37407a
|
|||
/**
|
||||
* Gets the cause of this teleportation event
|
||||
*
|
||||
@@ -84,6 +101,30 @@ public class PlayerTeleportEvent extends PlayerMoveEvent {
|
||||
@@ -84,6 +99,31 @@ public class PlayerTeleportEvent extends PlayerMoveEvent {
|
||||
UNKNOWN;
|
||||
}
|
||||
|
||||
|
@ -264,8 +262,9 @@ index 113e620ce38bb8ff97cf24e309af59b717774b36..cc75d2e84e68a1f63ec91a909c37407a
|
|||
+ * Gets if the player will be dismounted in this teleportation.
|
||||
+ *
|
||||
+ * @return dismounted or not
|
||||
+ * @deprecated dismounting on tp is no longer controlled by the server
|
||||
+ */
|
||||
+ @org.jetbrains.annotations.ApiStatus.Experimental
|
||||
+ @Deprecated(forRemoval = true)
|
||||
+ public boolean willDismountPlayer() {
|
||||
+ return this.dismounted;
|
||||
+ }
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue