Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Update upstream

Browse Source
This commit is contained in:
Cryptite
2024-02-13 21:54:38 -06:00
parent e495d7551a
commit e62b92a5fe
17 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/api/0005-Add-World-Instance-flag.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add World Instance flag
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index d3081d4445af73c2c7b23c5fc60861f184ac808e..415a137775f072d1aefa841b01b6bf7a5f97b6a3 100644
index c5fe36050eeaff80cfb989fe2f38370215af6fe5..671321b77475f20ec1cf682a184d42497160dce3 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -2663,6 +2663,11 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -2704,6 +2704,11 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
*/
public void setAutoSave(boolean value);

4
patches/api/0009-Smooth-Teleports.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Smooth Teleports
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 31aa6ef5fc2b3b88c72f5a15b8cc7a0e50c29f46..47c485099f7667590669309e82bdcabf5e4ebb74 100644
index 254a02ddb5dc867c9dd6c2086791f7ab94247fd3..69b7524859ec51f879cbb9d13f3ab9cec7549562 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3482,6 +3482,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3550,6 +3550,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
String getClientBrandName();
// Paper end

4
patches/api/0010-AntiXray-Bypass.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] AntiXray Bypass
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 47c485099f7667590669309e82bdcabf5e4ebb74..d1f9ee2f20fdb64eb8b2c87bdd2ecc8ec6135a70 100644
index 69b7524859ec51f879cbb9d13f3ab9cec7549562..23098a702f2073577d1ccec9f4cc4105cd24d668 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2990,6 +2990,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3058,6 +3058,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra);

4
patches/api/0011-Add-PlayerPreChunkLoadEvent.patch
View File

@@ -82,10 +82,10 @@ index 0000000000000000000000000000000000000000..946af80dd54f602b5ceb61365ca98b06
+}
\ No newline at end of file
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 415a137775f072d1aefa841b01b6bf7a5f97b6a3..0a9f6c7dd69acc7bf87af87b397c34b80871033b 100644
index 671321b77475f20ec1cf682a184d42497160dce3..2b9547dd059cb1e6dd224de813ba2193e2440135 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -525,6 +525,9 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -527,6 +527,9 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
//@Deprecated // Paper
public boolean refreshChunk(int x, int z);

14
patches/api/0018-Add-timeDamaged-to-EntityDamageEvent.patch
View File

@@ -5,19 +5,19 @@ Subject: [PATCH] Add timeDamaged to EntityDamageEvent
diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
index 4773f537dec20d6ebd82e4b145a1cdea0077fe90..f7a6346bc7eecc57fa7d69c801afa15230496f3c 100644
index 3b20000d9ac3e29fe3bc5093e6635377bee88dbd..0f9e2dfa5d2e60962e58291af58cbedb0525e60d 100644
--- a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
@@ -27,6 +27,7 @@ public class EntityDamageEvent extends EntityEvent implements Cancellable {
private final Map<DamageModifier, Double> originals;
@@ -29,6 +29,7 @@ public class EntityDamageEvent extends EntityEvent implements Cancellable {
private boolean cancelled;
private final DamageCause cause;
private final DamageSource damageSource;
+ private long timeDamaged = System.currentTimeMillis(); // Slice
public EntityDamageEvent(@NotNull final Entity damagee, @NotNull final DamageCause cause, final double damage) {
this(damagee, cause, new EnumMap<DamageModifier, Double>(ImmutableMap.of(DamageModifier.BASE, damage)), new EnumMap<DamageModifier, Function<? super Double, Double>>(ImmutableMap.of(DamageModifier.BASE, ZERO)));
@@ -193,6 +194,22 @@ public class EntityDamageEvent extends EntityEvent implements Cancellable {
return cause;
public EntityDamageEvent(@NotNull final Entity damagee, @NotNull final DamageCause cause, @NotNull final DamageSource damageSource, final double damage) {
this(damagee, cause, damageSource, new EnumMap<DamageModifier, Double>(ImmutableMap.of(DamageModifier.BASE, damage)), new EnumMap<DamageModifier, Function<? super Double, Double>>(ImmutableMap.of(DamageModifier.BASE, ZERO)));
@@ -210,6 +211,22 @@ public class EntityDamageEvent extends EntityEvent implements Cancellable {
return damageSource;
}
+ // Slice start

4
patches/api/0020-Non-saveable-entities.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Non-saveable-entities
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 1d0fd7ff8449f815a7d980af0b378181ea8bf8d8..0b057d6be0d55c275867bd1cb98387bc3237d881 100644
index 9022567f32a58b94ed030db22524876d8f1df4aa..b284e62465ddf8e4a129c99f202c45fd1a2e0c65 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -1107,4 +1107,19 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -1102,4 +1102,19 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
@NotNull String getScoreboardEntryName();
// Paper end - entity scoreboard name

4
patches/api/0021-Vanish.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Vanish
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 0b057d6be0d55c275867bd1cb98387bc3237d881..2f1c4ecb27d47745fa9bad3a36f006103aaf79b2 100644
index b284e62465ddf8e4a129c99f202c45fd1a2e0c65..5acc50a7e3be04d5ce49e8c9de0c2f3e1a2baf20 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -1122,4 +1122,19 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -1117,4 +1117,19 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
void setSaveable(boolean saveable);
// Slice end