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

Fix some merge conflicts

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-03-23 15:21:51 +11:00
parent 646c98c7d7
commit 61d5d29069
9 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
CraftBukkit-Patches/0082-Update-Chest-Animation-when-Cancelling-Event.patch
View File

@@ -1,4 +1,4 @@
From ef95f91c929c37c03bc09d142936b802d471e007 Mon Sep 17 00:00:00 2001
From c0ace7dda07e969ac697835c14abe346e996607d Mon Sep 17 00:00:00 2001
From: bloodshot <jdroque@gmail.com>
Date: Mon, 6 Jan 2014 16:29:51 -0500
Subject: [PATCH] Update Chest Animation when Cancelling Event
@@ -13,10 +13,10 @@ More info can be found here
https://bukkit.atlassian.net/browse/BUKKIT-1440
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index e8756ed..b8c3540 100644
index bd18f4d..d749254 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -622,7 +622,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -629,7 +629,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
// CraftBukkit start - Inventory open hook
Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerChest(this.inventory, iinventory));
@@ -28,7 +28,7 @@ index e8756ed..b8c3540 100644
// CraftBukkit end
this.nextContainerCounter();
@@ -635,7 +638,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -642,7 +645,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public void openHopper(TileEntityHopper tileentityhopper) {
// CraftBukkit start - Inventory open hook
Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerHopper(this.inventory, tileentityhopper));
@@ -40,7 +40,7 @@ index e8756ed..b8c3540 100644
// CraftBukkit end
this.nextContainerCounter();
@@ -648,7 +654,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -655,7 +661,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public void openMinecartHopper(EntityMinecartHopper entityminecarthopper) {
// CraftBukkit start - Inventory open hook
Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerHopper(this.inventory, entityminecarthopper));
@@ -52,7 +52,7 @@ index e8756ed..b8c3540 100644
// CraftBukkit end
this.nextContainerCounter();
@@ -661,7 +670,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -668,7 +677,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public void openFurnace(TileEntityFurnace tileentityfurnace) {
// CraftBukkit start - Inventory open hook
Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerFurnace(this.inventory, tileentityfurnace));
@@ -64,7 +64,7 @@ index e8756ed..b8c3540 100644
// CraftBukkit end
this.nextContainerCounter();
@@ -674,7 +686,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -681,7 +693,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public void openDispenser(TileEntityDispenser tileentitydispenser) {
// CraftBukkit start - Inventory open hook
Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerDispenser(this.inventory, tileentitydispenser));
@@ -76,7 +76,7 @@ index e8756ed..b8c3540 100644
// CraftBukkit end
this.nextContainerCounter();
@@ -687,7 +702,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -694,7 +709,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public void openBrewingStand(TileEntityBrewingStand tileentitybrewingstand) {
// CraftBukkit start - Inventory open hook
Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerBrewingStand(this.inventory, tileentitybrewingstand));
@@ -88,7 +88,7 @@ index e8756ed..b8c3540 100644
// CraftBukkit end
this.nextContainerCounter();
@@ -700,7 +718,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -707,7 +725,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public void openBeacon(TileEntityBeacon tileentitybeacon) {
// CraftBukkit start - Inventory open hook
Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerBeacon(this.inventory, tileentitybeacon));
@@ -100,7 +100,7 @@ index e8756ed..b8c3540 100644
// CraftBukkit end
this.nextContainerCounter();
@@ -743,7 +764,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -750,7 +771,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public void openHorseInventory(EntityHorse entityhorse, IInventory iinventory) {
// CraftBukkit start - Inventory open hook
Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerHorse(this.inventory, iinventory, entityhorse));
@@ -113,5 +113,5 @@ index e8756ed..b8c3540 100644
if (this.activeContainer != this.defaultContainer) {
--
1.8.5.2.msysgit.0
1.8.3.2