Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@40adc23 Fix incorrect javadoc in JarLibrary (#9513) PaperMC/Paper@c016e03 Fix unbreakable flint and steel consumed when igniting creepers (#9509) PaperMC/Paper@b1334b5 Mark Player.sendSignChange as deprecated (#9382) PaperMC/Paper@2f8d9db Pathfinder hasPath should check if path is done. (#9231) PaperMC/Paper@46a36d3 Make ExperienceOrb entities call EntitySpawnEvent (#9197) PaperMC/Paper@24d690f Fix hopper not marking source inv as changed (#9070) PaperMC/Paper@383f0ed Remove sign ticking (#9478) PaperMC/Paper@d8b8f61 Configurable Region Compression Format (#8505) PaperMC/Paper@2c54b39 Don't support hex in book title and author (#9493) PaperMC/Paper@e19177a Rewrote Amethyst logic to throw both BlockGrowEvent and BlockSpreadEvent (#9217) PaperMC/Paper@4283054 Add player whitelist events (#9209) PaperMC/Paper@aa93dcf feat: add minimessage tag resolvers overload to CommandSender#sendMessage (#9505) PaperMC/Paper@b14979e Remove isRemoved skip on .discard() (#9520) PaperMC/Paper@1837f6c Prevent entity removals if the entity slices is receiving status updates PaperMC/Paper@a40e48f Add cause to PlayerOpenSignEvent (#9441) PaperMC/Paper@7d1cc6d Add Translatable interface to MusicInstrument (#9538) PaperMC/Paper@6c7e3c5 Clarify viewers set mutability in chat events (#9525) PaperMC/Paper@f402f89 Bump net.kyori.ansi to 1.0.2 (#9546) PaperMC/Paper@81619a6 Fix treasure map config default (#9572) PaperMC/Paper@13c9d3c Bump net.kyori:ansi to 1.0.3 (#9575) PaperMC/Paper@2c55dd8 Expand use of strict advancement dim check (#9545) PaperMC/Paper@69a8013 Fix inventorycloseevent javadocs (#9533) PaperMC/Paper@2fa8efc Updated Upstream (Bukkit/CraftBukkit) (#9485) PaperMC/Paper@508a295 Only erase allay memory on non-item targets (#9570) PaperMC/Paper@31358d5 API for updating recipes on clients (#6463) PaperMC/Paper@8fe8ca6 Add clickable version on version command (#9347) PaperMC/Paper@d6d2b6f Only capture actual tree growth (#6464)
This commit is contained in:
@@ -452,10 +452,10 @@ index 1bfe465b9aaeea7d3c871140145b7de1b8f1d93d..babaefd2441b3b3e3b11ac1db6e5dc95
|
||||
+ // Parchment end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
|
||||
index 08ae501e97ae2a3f22b1994c9616fc7134cfc0c3..ad2c66f425546c6527417b2c5bc4a8d13e86c566 100644
|
||||
index 9b84cb5abdf3db55cbc7ba19c8cd6955bf4fc5ec..c1410e5d4ec281f6712ab695e57b84757ca0ec82 100644
|
||||
--- a/src/main/java/org/bukkit/OfflinePlayer.java
|
||||
+++ b/src/main/java/org/bukkit/OfflinePlayer.java
|
||||
@@ -17,7 +17,7 @@ import org.jetbrains.annotations.Nullable;
|
||||
@@ -19,7 +19,7 @@ import org.jetbrains.annotations.Nullable;
|
||||
* player that is stored on the disk and can, thus, be retrieved without the
|
||||
* player needing to be online.
|
||||
*/
|
||||
@@ -464,7 +464,7 @@ index 08ae501e97ae2a3f22b1994c9616fc7134cfc0c3..ad2c66f425546c6527417b2c5bc4a8d1
|
||||
|
||||
/**
|
||||
* Checks if this player is currently online
|
||||
@@ -160,6 +160,13 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
|
||||
@@ -190,6 +190,13 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
|
||||
@Nullable
|
||||
public Player getPlayer();
|
||||
|
||||
@@ -604,10 +604,10 @@ index 8b0d04d5b39ee817555a36adddc39b18fc6f0d02..1c87047de615a85ee20297295478770e
|
||||
// Paper start
|
||||
@Override
|
||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||
index 06b2b925de745850816d9ce0cf6316412c8d2b49..e688bc7290ad9da43b8ac05ce006851536867e4d 100644
|
||||
index 14c92390aeaeee518f43778ccd5fc820fdc62689..aa99410a0bee71e68da90b596134632f3a6364fe 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -49,7 +49,17 @@ import org.jetbrains.annotations.Nullable;
|
||||
@@ -51,7 +51,17 @@ import org.jetbrains.annotations.Nullable;
|
||||
/**
|
||||
* Represents a player, connected or not
|
||||
*/
|
||||
@@ -877,12 +877,12 @@ index 020739697a0b535cad0b15b574f77cdabbdfa3eb..ee4fd41e66852d5d2c62222c7b884473
|
||||
private final Material itemType;
|
||||
private final int itemAmount;
|
||||
diff --git a/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java
|
||||
index 21ad8888c0e403bfc63518502577d651c02dda05..1c59335a8f0a40162190f6fb73ffbfef0cd795d8 100644
|
||||
index 4db0a07db156c61867644f50c185e63b695e2462..eb6632e2e9d247bd54e02e3a134dfdbed9aeef39 100644
|
||||
--- a/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java
|
||||
+++ b/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java
|
||||
@@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull;
|
||||
/**
|
||||
* Represents a player related inventory event
|
||||
@@ -28,7 +28,7 @@ import org.jetbrains.annotations.NotNull;
|
||||
* on the next tick. Also be aware that this is not an exhaustive list, and
|
||||
* other methods could potentially create issues as well.
|
||||
*/
|
||||
-public class InventoryCloseEvent extends InventoryEvent {
|
||||
+public class InventoryCloseEvent extends InventoryEvent implements gg.projecteden.parchment.HasHumanEntity { // Parchment
|
||||
|
||||
Reference in New Issue
Block a user