Updated Upstream (CraftBukkit)
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 CraftBukkit Changes: 17543ecf SPIGOT-5035: Error Using Virtual Merchant GUI 0fc6922b SPIGOT-5028: Villager#setVillagerExperience() doesn't work bdbdbe44 SPIGOT-5024: Fox error - Unknown target reason
This commit is contained in:
parent
4ff5387091
commit
2f782a6652
583 changed files with 1650 additions and 1650 deletions
|
@ -1,11 +1,11 @@
|
|||
From 8ed3dc7a4e8ac87e1972ef34e9b3896603fb69d4 Mon Sep 17 00:00:00 2001
|
||||
From f77aa11967b3f1cb9daf228fdeb7942dd128585b Mon Sep 17 00:00:00 2001
|
||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Sat, 16 Jun 2018 01:17:39 -0500
|
||||
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 ffbf3d7a..e08dfe17 100644
|
||||
index ffbf3d7a8..e08dfe17f 100644
|
||||
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
@@ -523,5 +523,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue