SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-add missed method to the Player Collision API

Browse Source 
By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot
2014-03-23 18:16:32 +00:00
parent 26df4f1c88
commit 10de9c0a8b
4 changed files with 28 additions and 22 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 c0ace7dda07e969ac697835c14abe346e996607d Mon Sep 17 00:00:00 2001
From 0bcee56565bb69620125c4ec9c7938f395cc8c47 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 bd18f4d..d749254 100644
index 994edde..982a696 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -629,7 +629,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -635,7 +635,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 bd18f4d..d749254 100644
// CraftBukkit end
this.nextContainerCounter();
@@ -642,7 +645,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -648,7 +651,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 bd18f4d..d749254 100644
// CraftBukkit end
this.nextContainerCounter();
@@ -655,7 +661,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -661,7 +667,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 bd18f4d..d749254 100644
// CraftBukkit end
this.nextContainerCounter();
@@ -668,7 +677,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -674,7 +683,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 bd18f4d..d749254 100644
// CraftBukkit end
this.nextContainerCounter();
@@ -681,7 +693,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -687,7 +699,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 bd18f4d..d749254 100644
// CraftBukkit end
this.nextContainerCounter();
@@ -694,7 +709,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -700,7 +715,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 bd18f4d..d749254 100644
// CraftBukkit end
this.nextContainerCounter();
@@ -707,7 +725,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -713,7 +731,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 bd18f4d..d749254 100644
// CraftBukkit end
this.nextContainerCounter();
@@ -750,7 +771,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -756,7 +777,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 bd18f4d..d749254 100644
if (this.activeContainer != this.defaultContainer) {
--
1.8.3.2
1.8.5.2.msysgit.0