SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests Projekte Releases Wiki Aktivität

Updated Upstream (Bukkit/CraftBukkit)

Quellcode durchsuchen 
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
323d6ca3 #535: Add EntityCategory API to LivingEntity
7d3323d8 #526: Add Block#applyBoneMeal()

CraftBukkit Changes:
bf451617 SPIGOT-6109: Improve loot handling
bfea4559 SPIGOT-6111: NPE in CraftHumanEntity#openWorkbench & CraftHumanEntity#openEnchanting
ee7116b4 Add note to CONTRIBUTING.md to suggest keeping commit messages / titles the same
eae15943 #721: Add EntityCategory API to LivingEntity
8c611560 #702: Add Block#applyBoneMeal()
8408de02 #716: Fix barrel open API playing sound twice
74b6982b #711: Add Full RGB support to the console
Dieser Commit ist enthalten in:
Shane Freeder 2020-08-27 14:37:37 +01:00
Ursprung 4cc7de6c51
Commit 243d2313b9
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: A3F61EA5A085289C
25 geänderte Dateien mit 56 neuen und 58 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

8
Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch
Datei anzeigen

@ -5,13 +5,13 @@ Subject: [PATCH] Add methods for working with arrows stuck in living entities
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 8744f2e5fdf47200d433d708fcd9d9aaded56c0c..5b0c95ab7372c7accd190b9052b587637106c4af 100644
index dd6eff5cc56b6276fa897f0f892259c6804c3b05..ec585c7499eb88d10436ef1d461bace0c54a6f07 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -552,4 +552,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
* @param <T> the type of the passed value
@@ -563,4 +563,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
*/
<T> void setMemory(@NotNull MemoryKey<T> memoryKey, @Nullable T memoryValue);
@NotNull
public EntityCategory getCategory();
+
+ // Paper start
+ /**

4
Spigot-API-Patches/0106-Make-shield-blocking-delay-configurable.patch
Datei anzeigen

@ -5,10 +5,10 @@ Subject: [PATCH] Make shield blocking delay configurable
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index f0018823e17fab49e0167ece1c8c9eda2d562b87..3c02de9ebca92ba03beb1dd3c04a32c745e9ea8e 100644
index 30604ea038021032745ec586cee57c0089ad2d4b..022a6ef9158db937291051d6c4dfbc27f747bc3d 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -575,5 +575,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -586,5 +586,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
* @param arrows Number of arrows to stick in this entity
*/
void setArrowsStuck(int arrows);

4
Spigot-API-Patches/0113-LivingEntity-Hand-Raised-Item-Use-API.patch
Datei anzeigen

@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
How long an entity has raised hands to charge an attack or use an item
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 3c02de9ebca92ba03beb1dd3c04a32c745e9ea8e..5f8a544574bbc095f2b2c06ccbf887d17af93475 100644
index 022a6ef9158db937291051d6c4dfbc27f747bc3d..069d9131406d7e29db56f51940a0809a0dd9e703 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -12,6 +12,7 @@ import org.bukkit.attribute.Attributable;
@ -17,7 +17,7 @@ index 3c02de9ebca92ba03beb1dd3c04a32c745e9ea8e..5f8a544574bbc095f2b2c06ccbf887d1
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.projectiles.ProjectileSource;
@@ -589,5 +590,32 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -600,5 +601,32 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
* @param delay Delay in ticks
*/
void setShieldBlockingDelay(int delay);

4
Spigot-API-Patches/0181-Add-BlockSoundGroup-interface.patch
Datei anzeigen

@ -64,7 +64,7 @@ index 0000000000000000000000000000000000000000..8cf87d228a7006658d52ce0da16c2d74
+ Sound getFallSound();
+}
diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
index d7c7df85228c01529e266ffdd3b3bcdc9ed35774..596f1d68b69a2ba3976398d0045379f047541f40 100644
index d6f74dbcfeb153d4b17be2827e2989f2d8160d21..d4ba9c2b858204825d47fd6e91dab8c003df085a 100644
--- a/src/main/java/org/bukkit/block/Block.java
+++ b/src/main/java/org/bukkit/block/Block.java
@@ -1,6 +1,7 @@
@ -75,7 +75,7 @@ index d7c7df85228c01529e266ffdd3b3bcdc9ed35774..596f1d68b69a2ba3976398d0045379f0
import org.bukkit.Chunk;
import org.bukkit.FluidCollisionMode;
import org.bukkit.Location;
@@ -540,4 +541,16 @@ public interface Block extends Metadatable {
@@ -549,4 +550,16 @@ public interface Block extends Metadatable {
*/
@NotNull
BoundingBox getBoundingBox();

4
Spigot-API-Patches/0187-Add-effect-to-block-break-naturally.patch
Datei anzeigen

@ -5,7 +5,7 @@ Subject: [PATCH] Add effect to block break naturally
diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
index 596f1d68b69a2ba3976398d0045379f047541f40..999f2a362c62cf58752d9c3d378aafe6754d2aaf 100644
index d4ba9c2b858204825d47fd6e91dab8c003df085a..f8c599718143fe638de422fd4625f353ee6c54ae 100644
--- a/src/main/java/org/bukkit/block/Block.java
+++ b/src/main/java/org/bukkit/block/Block.java
@@ -469,6 +469,18 @@ public interface Block extends Metadatable {
@ -25,5 +25,5 @@ index 596f1d68b69a2ba3976398d0045379f047541f40..999f2a362c62cf58752d9c3d378aafe6
+ // Paper end
+
/**
* Returns a list of items which would drop by destroying this block
* Simulate bone meal application to this block (if possible).
*

4
Spigot-API-Patches/0189-Entity-Jump-API.patch
Datei anzeigen

@ -57,10 +57,10 @@ index 0000000000000000000000000000000000000000..f0067c2e953d18e1a33536980071ba3f
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index cda3ab0924b27bcd3ccfec4b0eb19ef1c24f18fb..a60523cc9c05396ce5c3ebabd231f3ca374c3efe 100644
index d470f0364e8be5398f1dad864389f7ac3df586ff..ff02b79dcac07b86a1cc8fd360965b39ee595eb9 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -732,5 +732,25 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -743,5 +743,25 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
* @return Whether or not this entity is using or charging an attack (Bow pulled back, drinking potion, eating food)
*/
boolean isHandRaised();

4
Spigot-API-Patches/0220-Add-playPickupItemAnimation-to-LivingEntity.patch
Datei anzeigen

@ -5,10 +5,10 @@ Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index a60523cc9c05396ce5c3ebabd231f3ca374c3efe..bed428d1bae3d90da41531cf135b19f78cccb2db 100644
index ff02b79dcac07b86a1cc8fd360965b39ee595eb9..9099e762907d38900a42b75dff1b6831b50aecb9 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -752,5 +752,28 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -763,5 +763,28 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
* @param jumping entity jump state
*/
void setJumping(boolean jumping);

4
Spigot-Server-Patches/0047-Be-a-bit-more-informative-in-maxHealth-exception.patch
Datei anzeigen

@ -5,10 +5,10 @@ Subject: [PATCH] Be a bit more informative in maxHealth exception
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 8f16b27123f1fc7c648c7d1f7c557e491d36f243..7e95ef170c418594f5469431c052e64107c08ab5 100644
index 83ea999ed51161356e075c8ba93375a5cafc2be9..c608732fb2b7c3d80a1fe12c007e0237caadcbfc 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -109,7 +109,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -111,7 +111,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
public void setHealth(double health) {
health = (float) health;
if ((health < 0) || (health > getMaxHealth())) {

8
Spigot-Server-Patches/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch
Datei anzeigen

@ -5,12 +5,12 @@ Subject: [PATCH] Add methods for working with arrows stuck in living entities
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 7e95ef170c418594f5469431c052e64107c08ab5..d5b165e8275c012d775b77b8440489716a6c3c08 100644
index c608732fb2b7c3d80a1fe12c007e0237caadcbfc..dd12147fd5b37b0b6e54568d65f571534d0b3c67 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -636,4 +636,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
public <T> void setMemory(MemoryKey<T> memoryKey, T t) {
getHandle().getBehaviorController().setMemory(CraftMemoryKey.fromMemoryKey(memoryKey), CraftMemoryMapper.toNms(t));
@@ -657,4 +657,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
throw new UnsupportedOperationException("Unsupported monster type: " + type + ". This is a bug, report this to Spigot.");
}
+
+ // Paper start

12
Spigot-Server-Patches/0146-Use-TerminalConsoleAppender-for-console-improvements.patch
Datei anzeigen

@ -336,13 +336,13 @@ index 463915ca7afa9a6f4337590e9c289fa23148aea8..a6f1d016696bd4feb836d5d12358b53e
net.minecraft.server.Main.main(options);
} catch (Throwable t) {
diff --git a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
index fefb09f27d166568e9bbe6a7eea5067116103d89..88acfeb8fa1a82f7a896a181ac57b435454656df 100644
index 4580642e0ee79e6d9c9bef0344e643bbc551205c..829c62b6d55cb5706be3ce6bdc758d6b204844ee 100644
--- a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
+++ b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
@@ -2,15 +2,15 @@ package org.bukkit.craftbukkit.command;
import java.util.EnumMap;
@@ -5,15 +5,13 @@ import java.util.EnumMap;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import jline.Terminal;
+//import jline.Terminal;
import org.bukkit.Bukkit;
@ -351,15 +351,13 @@ index fefb09f27d166568e9bbe6a7eea5067116103d89..88acfeb8fa1a82f7a896a181ac57b435
import org.bukkit.craftbukkit.CraftServer;
-import org.fusesource.jansi.Ansi;
-import org.fusesource.jansi.Ansi.Attribute;
+//import org.fusesource.jansi.Ansi;
+//import org.fusesource.jansi.Ansi.Attribute;
-public class ColouredConsoleSender extends CraftConsoleCommandSender {
+public class ColouredConsoleSender /*extends CraftConsoleCommandSender */{/* // Paper - disable
private final Terminal terminal;
private final Map<ChatColor, String> replacements = new EnumMap<ChatColor, String>(ChatColor.class);
private final ChatColor[] colors = ChatColor.values();
@@ -71,5 +71,5 @@ public class ColouredConsoleSender extends CraftConsoleCommandSender {
@@ -93,5 +91,5 @@ public class ColouredConsoleSender extends CraftConsoleCommandSender {
} else {
return new ColouredConsoleSender();
}

4
Spigot-Server-Patches/0166-LivingEntity-setKiller.patch
Datei anzeigen

@ -18,10 +18,10 @@ index 729726782446085a6c3b811c4b540ff154c6c115..e8e91a415daef307a3793dd36ebb71d3
protected int ticksFarFromPlayer;
protected float aJ;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index d5b165e8275c012d775b77b8440489716a6c3c08..5e2642b33d36e0695d6adc879f9595030adaaf31 100644
index dd12147fd5b37b0b6e54568d65f571534d0b3c67..0fade6225316e507c989bb265f94a1fa882473ce 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -321,6 +321,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -323,6 +323,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
return getHandle().killer == null ? null : (Player) getHandle().killer.getBukkitEntity();
}

4
Spigot-Server-Patches/0180-API-to-get-a-BlockState-without-a-snapshot.patch
Datei anzeigen

@ -39,10 +39,10 @@ index 6c4c804797fbbe73d179c6ed089427e64d0ebff4..6ccca984daa803ddf446a8f69aca0d86
return null;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
index ac63b098f43a82eb7d32cf7df6057ae8ce01cb7e..af0d1c742e806f5855a08c887c0e0654da2c6f95 100644
index 334728b1919bb10fb691015644ab46ee2df904ad..49e52d3ba93b2c68680f03aae244142e4532d68c 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
@@ -312,6 +312,20 @@ public class CraftBlock implements Block {
@@ -316,6 +316,20 @@ public class CraftBlock implements Block {
@Override
public BlockState getState() {

4
Spigot-Server-Patches/0227-Make-shield-blocking-delay-configurable.patch
Datei anzeigen

@ -48,10 +48,10 @@ index edd9fd66780fa8f7d3b1d807918a0cd8adb42b66..a425ca17bfe5b6b4d1048e09d3723b02
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 5e2642b33d36e0695d6adc879f9595030adaaf31..38eb8fbac1d5131249dd9ba8b9942b4c85de2c7f 100644
index 0fade6225316e507c989bb265f94a1fa882473ce..86ebd689189c442e3fec81e13fe912a2ff60e253 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -657,5 +657,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -678,5 +678,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
public void setArrowsStuck(int arrows) {
getHandle().setArrowCount(arrows);
}

4
Spigot-Server-Patches/0231-Implement-EntityKnockbackByEntityEvent.patch
Datei anzeigen

@ -28,10 +28,10 @@ index 85d2f4bab52cef2822fb0431c9cf7b7becbd5ee7..0f7e162b342ac589dc357508a1dcd1ab
// CraftBukkit end
}
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 3b12724a7bfa7a901261ff0c67338a08ccc1fc6f..bbb6dc6b7ca77779a1aab8b1437ee32509717efe 100644
index 5e3ab1e430c81ebfa9214020ffb1b3c61344ec55..95f1a9d7d5f381a0e345a7973c402136cddabb36 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -1499,7 +1499,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -1500,7 +1500,7 @@ public abstract class EntityInsentient extends EntityLiving {
if (flag) {
if (f1 > 0.0F && entity instanceof EntityLiving) {

4
Spigot-Server-Patches/0233-LivingEntity-Hand-Raised-Item-Use-API.patch
Datei anzeigen

@ -32,10 +32,10 @@ index fb1b1014c0538b84491c315e4f868b9854b4b640..84c330fd8f808775a42f0d0eddfe359b
return this.isHandRaised() ? this.activeItem.k() - this.dY() : 0;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 38eb8fbac1d5131249dd9ba8b9942b4c85de2c7f..bbe6188f50dd3c456dec5c3239bdcffbfceb3589 100644
index 86ebd689189c442e3fec81e13fe912a2ff60e253..993128183c13c2c01665215f1157c70277249a1d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -667,5 +667,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -688,5 +688,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
public void setShieldBlockingDelay(int delay) {
getHandle().setShieldBlockingDelay(delay);
}

4
Spigot-Server-Patches/0281-Add-ray-tracing-methods-to-LivingEntity.patch
Datei anzeigen

@ -33,10 +33,10 @@ index adc2ba97b0f258ae9fdbde0bcee02f63fc9fbac7..5ebd2d25cc52de3f1a091f0620d6b46b
public int getShieldBlockingDelay() {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index bbe6188f50dd3c456dec5c3239bdcffbfceb3589..2e7bacff55f57fda8b5644fb9d7934a615e5f550 100644
index 993128183c13c2c01665215f1157c70277249a1d..63f46a4c6fda5a08f89d68da879ce4ad83056cf5 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -199,6 +199,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -201,6 +201,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
return blocks.get(0);
}

4
Spigot-Server-Patches/0298-Add-sun-related-API.patch
Datei anzeigen

@ -5,10 +5,10 @@ Subject: [PATCH] Add sun related API
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index bbb6dc6b7ca77779a1aab8b1437ee32509717efe..6279f00bc8ca0334d34305590b8eed0637ccdf46 100644
index 95f1a9d7d5f381a0e345a7973c402136cddabb36..f5203a0058974de7f1e3e9e291908ff37d54dbd0 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -1528,6 +1528,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -1529,6 +1529,7 @@ public abstract class EntityInsentient extends EntityLiving {
}

4
Spigot-Server-Patches/0339-Add-LivingEntity-getTargetEntity.patch
Datei anzeigen

@ -120,10 +120,10 @@ index b88a99221933108141b558adef6aa91f0cedc136..c13bb708ccd14c3848afbc9afaf6439c
return !(entity instanceof EntityHuman) || !entity.isSpectator() && !((EntityHuman) entity).isCreative() && entity.world.getDifficulty() != EnumDifficulty.PEACEFUL;
};
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 2e7bacff55f57fda8b5644fb9d7934a615e5f550..39b8ab223bc708e5ee3dc967e489fdc76d944416 100644
index 63f46a4c6fda5a08f89d68da879ce4ad83056cf5..607f0bca1ca454bd60aad82df81702bf15e0ff4a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -219,6 +219,33 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -221,6 +221,33 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
new com.destroystokyo.paper.block.TargetBlockInfo(org.bukkit.craftbukkit.block.CraftBlock.at(getHandle().world, ((net.minecraft.server.MovingObjectPositionBlock)rayTrace).getBlockPosition()),
net.minecraft.server.MCUtil.toBukkitBlockFace(((net.minecraft.server.MovingObjectPositionBlock)rayTrace).getDirection()));
}

4
Spigot-Server-Patches/0361-Implement-CraftBlockSoundGroup.patch
Datei anzeigen

@ -84,10 +84,10 @@ index 957799e034ad8bc7201815b849244b7a809fb666..2301b38ac3b488809d2f624055ad3e23
return this.ab;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
index af0d1c742e806f5855a08c887c0e0654da2c6f95..1730a33fe7a10960b0d0c5f3905f38b995931213 100644
index 49e52d3ba93b2c68680f03aae244142e4532d68c..8a1261ccb3b3eae7f00fdcad7f1220f459cdbfad 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
@@ -726,4 +726,11 @@ public class CraftBlock implements Block {
@@ -738,4 +738,11 @@ public class CraftBlock implements Block {
AxisAlignedBB aabb = shape.getBoundingBox();
return new BoundingBox(getX() + aabb.minX, getY() + aabb.minY, getZ() + aabb.minZ, getX() + aabb.maxX, getY() + aabb.maxY, getZ() + aabb.maxZ);
}

6
Spigot-Server-Patches/0405-Add-effect-to-block-break-naturally.patch
Datei anzeigen

@ -5,10 +5,10 @@ Subject: [PATCH] Add effect to block break naturally
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
index 1730a33fe7a10960b0d0c5f3905f38b995931213..733f2430d461c66735a529a6b1a1a2e58ab1dd85 100644
index 8a1261ccb3b3eae7f00fdcad7f1220f459cdbfad..9905478f08aee2ea2beb6a1bcd86c2ab05718cac 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
@@ -628,6 +628,13 @@ public class CraftBlock implements Block {
@@ -632,6 +632,13 @@ public class CraftBlock implements Block {
@Override
public boolean breakNaturally(ItemStack item) {
@ -22,7 +22,7 @@ index 1730a33fe7a10960b0d0c5f3905f38b995931213..733f2430d461c66735a529a6b1a1a2e5
// Order matters here, need to drop before setting to air so skulls can get their data
net.minecraft.server.IBlockData iblockdata = this.getNMS();
net.minecraft.server.Block block = iblockdata.getBlock();
@@ -637,6 +644,7 @@ public class CraftBlock implements Block {
@@ -641,6 +648,7 @@ public class CraftBlock implements Block {
// Modelled off EntityHuman#hasBlock
if (block != Blocks.AIR && (item == null || !iblockdata.isRequiresSpecialTool() || nmsItem.canDestroySpecialBlock(iblockdata))) {
net.minecraft.server.Block.dropItems(iblockdata, world.getMinecraftWorld(), position, world.getTileEntity(position), null, nmsItem);

4
Spigot-Server-Patches/0414-Entity-Jump-API.patch
Datei anzeigen

@ -34,10 +34,10 @@ index ed8c0073f0c938c2ee8ed0dad2afda21a115b67d..01cc3d94d3fe1f82c94abdfcc92b0d3b
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 39b8ab223bc708e5ee3dc967e489fdc76d944416..b3ec32b20751fbea2f6df14fc5e9f84682493bfd 100644
index 607f0bca1ca454bd60aad82df81702bf15e0ff4a..a42db6ae603da8850a29944b63da5928dd2dd40f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -736,5 +736,20 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -757,5 +757,20 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
public boolean isHandRaised() {
return getHandle().isHandRaised();
}

4
Spigot-Server-Patches/0478-Fix-PotionEffect-ignores-icon-flag.patch
Datei anzeigen

@ -5,10 +5,10 @@ Subject: [PATCH] Fix PotionEffect ignores icon flag
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index b3ec32b20751fbea2f6df14fc5e9f84682493bfd..3777aba5f32f58f4620d4fe496af4e641ff8c858 100644
index a42db6ae603da8850a29944b63da5928dd2dd40f..76781281c0a6e7528b79002a0645902d33c8ae04 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -387,7 +387,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -389,7 +389,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@Override
public boolean addPotionEffect(PotionEffect effect, boolean force) {

4
Spigot-Server-Patches/0559-Add-playPickupItemAnimation-to-LivingEntity.patch
Datei anzeigen

@ -5,10 +5,10 @@ Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 3777aba5f32f58f4620d4fe496af4e641ff8c858..e0ec715ef363867665ea14dc71e219c1023e0819 100644
index 76781281c0a6e7528b79002a0645902d33c8ae04..0819c31979540443576411ba8135e01a8db59775 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -751,5 +751,9 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -772,5 +772,9 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
}
}

2
work/Bukkit

@ -1 +1 @@
Subproject commit 29e9b367a4abdf77098b02318c22f24b92a218d2
Subproject commit 323d6ca31870ea42606ba2a6a75f3f7e0f2248b2

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 049120068dee7b541ecab95fc8cf03f7e76f8337
Subproject commit bf451617f359f811ec8179a30af8e8b0c6ea2144