OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-16 06:30:46 +01:00
Code Issues Projects Releases Packages Wiki Activity

Updated Upstream (Bukkit/CraftBukkit) (#5735)

Browse source
This commit is contained in:
Jake Potrebic 2021-05-27 16:24:27 -07:00
parent bc7297fb97
commit 8c6e42583a
5 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Spigot-API-Patches/RangedEntity-API.patch
View file

@ -96,16 +96,12 @@ diff --git a/src/main/java/org/bukkit/entity/Piglin.java b/src/main/java/org/buk
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/entity/Piglin.java
+++ b/src/main/java/org/bukkit/entity/Piglin.java
@@ -0,0 +0,0 @@
package org.bukkit.entity;
+import com.destroystokyo.paper.entity.RangedEntity; // Paper
+
@@ -0,0 +0,0 @@ import org.jetbrains.annotations.NotNull;
/**
* Represents a Piglin.
*/
-public interface Piglin extends PiglinAbstract {
+public interface Piglin extends PiglinAbstract, RangedEntity { // Paper
-public interface Piglin extends PiglinAbstract, InventoryHolder {
+public interface Piglin extends PiglinAbstract, InventoryHolder, com.destroystokyo.paper.entity.RangedEntity { // Paper
/**
* Get whether the piglin is able to hunt hoglins.

2
Spigot-Server-Patches/Implemented-BlockFailedDispenseEvent.patch
View file

@ -49,7 +49,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
import org.bukkit.event.Event;
import org.bukkit.event.Event.Result;
@@ -0,0 +0,0 @@ public class CraftEventFactory {
Bukkit.getPluginManager().callEvent(event);
return event;
}
+

4
Spigot-Server-Patches/RangedEntity-API.patch
View file

@ -95,9 +95,9 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java b/src/
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java
@@ -0,0 +0,0 @@ import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
@@ -0,0 +0,0 @@ import org.bukkit.entity.EntityType;
import org.bukkit.entity.Piglin;
import org.bukkit.inventory.Inventory;
-public class CraftPiglin extends CraftPiglinAbstract implements Piglin {
+public class CraftPiglin extends CraftPiglinAbstract implements Piglin, com.destroystokyo.paper.entity.CraftRangedEntity<EntityPiglin> { // Paper

2
work/Bukkit

@ -1 +1 @@
Subproject commit f563167d33eac6217c94e1cdffb1bc0bfd3031c9
Subproject commit 0e11bc1faa72b7e23b0ad1f5de847250e06b6118

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit afa0678e1b9efcc2fdd3f3ecbecfb7fed22dd218
Subproject commit fd905ab5279bb3fcc0970ff4306288399d09d127