Update B/CB
This commit is contained in:
parent
d841b8a345
commit
fed4815fff
72 changed files with 347 additions and 453 deletions
|
@ -1,14 +1,14 @@
|
|||
From 447ed7747e09f6b38ea1119083b95c47c55e1bab Mon Sep 17 00:00:00 2001
|
||||
From a53027c798480be3017e4e592c0f8667e63bc612 Mon Sep 17 00:00:00 2001
|
||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Sun, 7 May 2017 06:26:01 -0500
|
||||
Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
|
||||
index dfba8163..83ee01f7 100644
|
||||
index 29f03f5d..da19009b 100644
|
||||
--- a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
|
||||
+++ b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java
|
||||
@@ -11,6 +11,7 @@ import org.bukkit.event.HandlerList;
|
||||
@@ -14,6 +14,7 @@ import org.bukkit.event.entity.EntityPickupItemEvent;
|
||||
public class PlayerPickupItemEvent extends PlayerEvent implements Cancellable {
|
||||
private static final HandlerList handlers = new HandlerList();
|
||||
private final Item item;
|
||||
|
@ -16,7 +16,7 @@ index dfba8163..83ee01f7 100644
|
|||
private boolean cancel = false;
|
||||
private final int remaining;
|
||||
|
||||
@@ -38,12 +39,34 @@ public class PlayerPickupItemEvent extends PlayerEvent implements Cancellable {
|
||||
@@ -41,12 +42,34 @@ public class PlayerPickupItemEvent extends PlayerEvent implements Cancellable {
|
||||
return remaining;
|
||||
}
|
||||
|
||||
|
@ -52,5 +52,5 @@ index dfba8163..83ee01f7 100644
|
|||
|
||||
@Override
|
||||
--
|
||||
2.13.1
|
||||
2.13.3
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From d84e33b34c717e1200495f444aeb93582a7086e0 Mon Sep 17 00:00:00 2001
|
||||
From f57a4ab8a98fe14d6591558f0eb061caf775b542 Mon Sep 17 00:00:00 2001
|
||||
From: Sweepyoface <github@sweepy.pw>
|
||||
Date: Sat, 17 Jun 2017 18:48:06 -0400
|
||||
Subject: [PATCH] Add UnknownCommandEvent
|
||||
|
@ -88,5 +88,5 @@ index 00000000..19d634c3
|
|||
+}
|
||||
+
|
||||
--
|
||||
2.13.2
|
||||
2.13.3
|
||||
|
|
@ -1,63 +0,0 @@
|
|||
From 92a2a2f1b72749139bbbb785746b546a3741474f Mon Sep 17 00:00:00 2001
|
||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Fri, 5 May 2017 01:16:10 -0500
|
||||
Subject: [PATCH] EntityPickupItemEvent
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/event/entity/EntityPickupItemEvent.java b/src/main/java/org/bukkit/event/entity/EntityPickupItemEvent.java
|
||||
new file mode 100644
|
||||
index 00000000..3d40b515
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/org/bukkit/event/entity/EntityPickupItemEvent.java
|
||||
@@ -0,0 +1,48 @@
|
||||
+package org.bukkit.event.entity;
|
||||
+
|
||||
+import org.bukkit.entity.Item;
|
||||
+import org.bukkit.entity.LivingEntity;
|
||||
+import org.bukkit.event.Cancellable;
|
||||
+import org.bukkit.event.HandlerList;
|
||||
+
|
||||
+/**
|
||||
+ * Thrown when an entity picks an item up from the ground
|
||||
+ */
|
||||
+public class EntityPickupItemEvent extends EntityEvent implements Cancellable {
|
||||
+ private static final HandlerList handlers = new HandlerList();
|
||||
+ private final Item item;
|
||||
+ private boolean cancel = false;
|
||||
+
|
||||
+ public EntityPickupItemEvent(final LivingEntity entity, final Item item) {
|
||||
+ super(entity);
|
||||
+ this.item = item;
|
||||
+ }
|
||||
+
|
||||
+ /**
|
||||
+ * Gets the Item picked up by the entity.
|
||||
+ *
|
||||
+ * @return Item
|
||||
+ */
|
||||
+ public Item getItem() {
|
||||
+ return item;
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public boolean isCancelled() {
|
||||
+ return cancel;
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public void setCancelled(boolean cancel) {
|
||||
+ this.cancel = cancel;
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public HandlerList getHandlers() {
|
||||
+ return handlers;
|
||||
+ }
|
||||
+
|
||||
+ public static HandlerList getHandlerList() {
|
||||
+ return handlers;
|
||||
+ }
|
||||
+}
|
||||
--
|
||||
2.13.1
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From 6404a253627d07f4b1bb7be54371e459c6c8ad64 Mon Sep 17 00:00:00 2001
|
||||
From 749b81ac44634b7b41a61d72bf05086b872c39c6 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sat, 17 Jun 2017 15:04:51 -0400
|
||||
Subject: [PATCH] Shoulder Entities Release API
|
||||
|
@ -34,5 +34,5 @@ index 518aa2a9..3939d4af 100644
|
|||
* Gets the entity currently perched on the left shoulder or null if no
|
||||
* entity.
|
||||
--
|
||||
2.13.0
|
||||
2.13.3
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From 6621b1acfb0898fa33bd6d3461ebff382a569465 Mon Sep 17 00:00:00 2001
|
||||
From 5385d2681d3cad437db365cbfa18673430f323e2 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sat, 17 Jun 2017 16:30:44 -0400
|
||||
Subject: [PATCH] Profile Lookup Events
|
||||
|
@ -7,7 +7,7 @@ Adds a Pre Lookup Event and a Post Lookup Event so that plugins may prefill in p
|
|||
profiles that had to be looked up.
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 862910e0..c2922a7b 100644
|
||||
index 09fb3408..4ff0c6f2 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -60,6 +60,13 @@
|
||||
|
@ -235,5 +235,5 @@ index 00000000..750b9334
|
|||
+ }
|
||||
+}
|
||||
--
|
||||
2.13.2
|
||||
2.13.3
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
From e694e778d2f5ac074f8e76ae11fb181d762d8c32 Mon Sep 17 00:00:00 2001
|
||||
From 65b1c1ecda7de3d1b4fa683bc9942ec93db9d31f Mon Sep 17 00:00:00 2001
|
||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Sun, 18 Jun 2017 18:17:05 -0500
|
||||
Subject: [PATCH] Entity#fromMobSpawner()
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
|
||||
index c86c1c5f..b3d59a39 100644
|
||||
index c86c1c5f..57f62ae4 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Entity.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Entity.java
|
||||
@@ -505,5 +505,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
|
||||
|
@ -22,5 +22,5 @@ index c86c1c5f..b3d59a39 100644
|
|||
// Paper end
|
||||
}
|
||||
--
|
||||
2.13.2.windows.1
|
||||
2.13.3
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From fd17520035a7195a2314c1648f29ae84c1d9233b Mon Sep 17 00:00:00 2001
|
||||
From 8aa765ebb7b4bb1ba7b65a662bff871d50f90422 Mon Sep 17 00:00:00 2001
|
||||
From: willies952002 <admin@domnian.com>
|
||||
Date: Thu, 20 Jul 2017 18:05:36 -0400
|
||||
Subject: [PATCH] Allow Changing of Player Sample in ServerListPingEvent
|
||||
|
@ -33,5 +33,5 @@ index 3c38d857..84de3ce4 100644
|
|||
+
|
||||
}
|
||||
--
|
||||
2.11.0
|
||||
2.13.3
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From 756079e8a09b2663c5969682a4afce4db5d74672 Mon Sep 17 00:00:00 2001
|
||||
From 50ad728a3cfb0af96a191960a256d0288ffb22bf Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sat, 10 Dec 2016 16:12:48 -0500
|
||||
Subject: [PATCH] Improve the Saddle API for Horses
|
||||
|
@ -94,5 +94,5 @@ index 00000000..010dc364
|
|||
+ void setSaddle(ItemStack stack);
|
||||
+}
|
||||
--
|
||||
2.13.0
|
||||
2.13.3
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From 4b1f37248bc27055112cfa172fa773dca45fbb47 Mon Sep 17 00:00:00 2001
|
||||
From d97890f63015395b9fcf7bc382686ddfe5f3e266 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Wed, 4 May 2016 23:55:48 -0400
|
||||
Subject: [PATCH] ensureServerConversions API
|
||||
|
@ -61,5 +61,5 @@ index 188ae6d7..6bb19b9d 100644
|
|||
+ // Paper end
|
||||
}
|
||||
--
|
||||
2.13.0
|
||||
2.13.3
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From f7de0db935ac36012247b83c4576cf07317891fb Mon Sep 17 00:00:00 2001
|
||||
From 7c28e3c2d2ebf454068b75f615be4feb5ebaeede Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Wed, 4 May 2016 23:55:48 -0400
|
||||
Subject: [PATCH] Add getI18NDisplayName API
|
||||
|
@ -49,5 +49,5 @@ index 6bb19b9d..7a52da9b 100644
|
|||
// Paper end
|
||||
}
|
||||
--
|
||||
2.13.0
|
||||
2.13.3
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From e422959fbe06c2055a5089da77024835870a5662 Mon Sep 17 00:00:00 2001
|
||||
From c814474d6c5d9c4d7142d141e6dabf3935a577cb Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Mon, 3 Jul 2017 18:11:34 -0500
|
||||
Subject: [PATCH] ProfileWhitelistVerifyEvent
|
||||
|
@ -124,5 +124,5 @@ index 00000000..59b69b23
|
|||
+ }
|
||||
+}
|
||||
--
|
||||
2.13.0
|
||||
2.13.3
|
||||
|
Loading…
Add table
Add a link
Reference in a new issue