twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-01 12:42:05 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update upstream B/CB

Browse Source 
--- work/Bukkit
Submodule work/Bukkit 96e09e50..0b95b68f:
  > SPIGOT-4650: Charging API for Vex

--- work/CraftBukkit
Submodule work/CraftBukkit f102d882..77ca7ca0:
  > Rebuild patches
  > Improve damage handling of dead entities
  > SPIGOT-4646: Test + fix InventoryWrapper.getContents
  > SPIGOT-4650: Charging API for Vex
This commit is contained in:
Zach Brown
2019-03-06 00:46:21 -05:00
parent bf3ce069c8
commit a663d0d550
5 changed files with 17 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Spigot-API-Patches/Allow-setting-the-vex-s-summoner.patch
View File

@@ -5,27 +5,28 @@ Subject: [PATCH] Allow setting the vex's summoner
diff --git a/src/main/java/org/bukkit/entity/Vex.java b/src/main/java/org/bukkit/entity/Vex.java diff --git a/src/main/java/org/bukkit/entity/Vex.java b/src/main/java/org/bukkit/entity/Vex.java
index d395e405..78f0082e 100644 index 7b9b21e5..23a15f8f 100644
--- a/src/main/java/org/bukkit/entity/Vex.java --- a/src/main/java/org/bukkit/entity/Vex.java
+++ b/src/main/java/org/bukkit/entity/Vex.java +++ b/src/main/java/org/bukkit/entity/Vex.java
@@ -0,0 +0,0 @@ public interface Vex extends Monster { @@ -0,0 +0,0 @@ public interface Vex extends Monster {
/**
* @return What Entity (most likely an Evoker, but not guaranteed) summoned this Vex
*/ */
- Mob getSummoner(); // Paper void setCharging(boolean charging);
+ // Paper start + // Paper start
+ /** /**
- * @return What Entity (most likely an Evoker, but not guaranteed) summoned this Vex
+ * Get the Mob that summoned this vex + * Get the Mob that summoned this vex
+ * + *
+ * @return Mob that summoned this vex + * @return Mob that summoned this vex
+ */ + */
+ Mob getSummoner(); + Mob getSummoner();
+
+ /** + /**
+ * Set the summoner of this vex + * Set the summoner of this vex
+ * + *
+ * @param summoner New summoner + * @param summoner New summoner
+ */ */
- Mob getSummoner(); // Paper
+ void setSummoner(Mob summoner); + void setSummoner(Mob summoner);
+ // Paper end + // Paper end
} }

16
Spigot-API-Patches/Vex-getSummoner-API.patch
View File

@@ -6,19 +6,17 @@ Subject: [PATCH] Vex#getSummoner API
Get's the Mob that summoned this Vex Get's the Mob that summoned this Vex
diff --git a/src/main/java/org/bukkit/entity/Vex.java b/src/main/java/org/bukkit/entity/Vex.java diff --git a/src/main/java/org/bukkit/entity/Vex.java b/src/main/java/org/bukkit/entity/Vex.java
index a2f2fcae..d395e405 100644 index 6b61c4ab..7b9b21e5 100644
--- a/src/main/java/org/bukkit/entity/Vex.java --- a/src/main/java/org/bukkit/entity/Vex.java
+++ b/src/main/java/org/bukkit/entity/Vex.java +++ b/src/main/java/org/bukkit/entity/Vex.java
@@ -0,0 +0,0 @@ package org.bukkit.entity; @@ -0,0 +0,0 @@ public interface Vex extends Monster {
/** * @param charging new state
* Represents a Vex. */
*/ void setCharging(boolean charging);
-public interface Vex extends Monster { } +
+public interface Vex extends Monster {
+ /** + /**
+ * @return What Entity (most likely an Evoker, but not guaranteed) summoned this Vex + * @return What Entity (most likely an Evoker, but not guaranteed) summoned this Vex
+ */ + */
+ Mob getSummoner(); // Paper + Mob getSummoner(); // Paper
+ }
+}
-- --

22
Spigot-Server-Patches/Improve-damage-handling-of-dead-entities.patch
View File

@@ -1,22 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Phoenix616 <mail@moep.tv>
Date: Tue, 5 Mar 2019 23:57:38 -0500
Subject: [PATCH] Improve damage handling of dead entities
Manual application of 73597ed865e92dbfad404b69eb6468fb7e129ad2 until the
upstream patch file is sorted out.
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index b4f21171..77ea0ec4 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
return false;
} else if (this.world.isClientSide) {
return false;
- } else if (this.getHealth() <= 0.0F) {
+ } else if (this.dead || this.killed || this.getHealth() <= 0.0F) { // Paper // CraftBukkit - Don't allow entities that got set to dead/killed elsewhere to get damaged and die
return false;
} else if (damagesource.p() && this.hasEffect(MobEffects.FIRE_RESISTANCE)) {
return false;
--

2
work/Bukkit

Submodule work/Bukkit updated: 96e09e50c1...0b95b68f96

2
work/CraftBukkit

Submodule work/CraftBukkit updated: f102d88299...77ca7ca07b