Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 17:07:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
abca14ff9 Updated Upstream (Bukkit/CraftBukkit)
This commit is contained in:
jmp
2020-12-21 00:45:03 -08:00
parent 25c7772584
commit 3b18ff8cb9
28 changed files with 68 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/api/0024-Ridables.patch
View File

@@ -169,10 +169,10 @@ index 0000000000000000000000000000000000000000..c0ec5a130985e8da4cc9e596a6b70503
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index ff2e4fc8a632453e280f1a6ec05878b0e7fd2a9c..cd209dcfbb81010e916b40d61d0a038c75a6f788 100644
index 76e857c364fe79e20cf9bde54b65e5b7108174fd..5f7947cd6f3bf9f76e8b3bac339f61b9afadaaad 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -696,4 +696,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -698,4 +698,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
public boolean isTicking();
// Paper end

13
patches/api/0035-Fix-javadoc-warnings-missing-param-and-return.patch
View File

@@ -881,10 +881,10 @@ index d9be83961b28b927a587f6dbb339b531520e4865..1ff4c5e283ac05c405c09bd4b8530664
/**
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index cd209dcfbb81010e916b40d61d0a038c75a6f788..77cb59f180abda6d92208614be5461251111bed8 100644
index 5f7947cd6f3bf9f76e8b3bac339f61b9afadaaad..08dbe8208fad174f03a0e08c26bb48a0729ec0ce 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -615,6 +615,9 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -622,6 +622,9 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
Pose getPose();
// Spigot start
@@ -894,14 +894,7 @@ index cd209dcfbb81010e916b40d61d0a038c75a6f788..77cb59f180abda6d92208614be546125
public class Spigot extends CommandSender.Spigot {
}
@@ -658,41 +661,57 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
/**
* Check if entity is in water
+ *
+ * @return True if entity is in water
*/
public boolean isInWater();
@@ -665,36 +668,50 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
/**
* Check if entity is in rain