Organise imports

By: md_5 <git@md-5.net>
2021-03-09 08:47:33 +11:00
parent 1ae7bcc4d0
commit b2efd58164
188 changed files with 879 additions and 825 deletions
--- a/paper-server/nms-patches/EntityVillagerTrader.patch
+++ b/paper-server/nms-patches/EntityVillagerTrader.patch
@@ -1,19 +1,20 @@
 --- a/net/minecraft/server/EntityVillagerTrader.java
 +++ b/net/minecraft/server/EntityVillagerTrader.java
-@@ -2,6 +2,12 @@
- 
+@@ -3,6 +3,13 @@
 import java.util.EnumSet;
 import javax.annotation.Nullable;
+ 
 +// CraftBukkit start
 +import org.bukkit.Bukkit;
 +import org.bukkit.craftbukkit.inventory.CraftMerchantRecipe;
 +import org.bukkit.entity.AbstractVillager;
 +import org.bukkit.event.entity.VillagerAcquireTradeEvent;
 +// CraftBukkit end
- 
+
 public class EntityVillagerTrader extends EntityVillagerAbstract {
 
-@@ -12,6 +18,7 @@
+     @Nullable
+@@ -12,6 +19,7 @@
     public EntityVillagerTrader(EntityTypes<? extends EntityVillagerTrader> entitytypes, World world) {
         super(entitytypes, world);
         this.attachedToPlayer = true;
@@ -21,7 +22,7 @@
     }
 
     @Override
-@@ -89,7 +96,16 @@
+@@ -89,7 +97,16 @@
             MerchantRecipe merchantrecipe = villagertrades_imerchantrecipeoption.a(this, this.random);
 
             if (merchantrecipe != null) {