mirror/Paper
2
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-15 07:01:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Re-add missed method to the Player Collision API

Browse Source
This commit is contained in:
Thinkofdeath 2014-03-23 18:16:32 +00:00
parent 58a6cb892b
commit 6d22914df8
4 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CraftBukkit-Patches/0047-Player-Collision-API.patch
View File

@ -1,4 +1,4 @@
From c8e14405ce9b28101adaa15d95495fbed43b5eda Mon Sep 17 00:00:00 2001
From b807256e061290c356ef0ea54f4e82797114a57f Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:27:07 +1000
Subject: [PATCH] Player Collision API
@ -31,10 +31,10 @@ index 57157ef..c04ff95 100644
Entity entity = (Entity) list.get(i);
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 4c06a42..bd18f4d 100644
index 4c06a42..994edde 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -64,6 +64,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -64,6 +64,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public boolean joining = true;
public int lastPing = -1; // Spigot
// CraftBukkit end
@ -42,6 +42,12 @@ index 4c06a42..bd18f4d 100644
+ public boolean collidesWithEntities = true;
+
+ @Override
+ public boolean Q()
+ {
+ return this.collidesWithEntities && super.Q();
+ }
+
+ @Override
+ public boolean R()
+ {
+ return this.collidesWithEntities && super.R();
@ -75,5 +81,5 @@ index 07c8a2c..296e20a 100644
public Player.Spigot spigot()
--
1.8.3.2
1.8.5.2.msysgit.0

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

8
CraftBukkit-Patches/0100-Allow-Configuring-Chunks-per-Packet.patch
View File

@ -1,14 +1,14 @@
From cf581b8daf7b5d52b0b12fea8e25ac60a83efe01 Mon Sep 17 00:00:00 2001
From cfde0347aea037b965103659e74da0448c8e8f45 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 28 Jan 2014 20:35:35 +1100
Subject: [PATCH] Allow Configuring Chunks per Packet
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index d749254..4ad2eeb 100644
index 982a696..9981da2 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -209,7 +209,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -215,7 +215,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
Chunk chunk;
@ -34,5 +34,5 @@ index ffdb33e..1290829 100644
+ }
}
--
1.8.3.2
1.8.5.2.msysgit.0

6
CraftBukkit-Patches/0124-Cap-villagers-window-name-to-prevent-client-disconne.patch
View File

@ -1,14 +1,14 @@
From ae90ccd76f7c287b5363d646f3c5e172ad47142a Mon Sep 17 00:00:00 2001
From 03fb61c80cb0e990d94dce744ab2cc8899231ea3 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Sun, 23 Mar 2014 10:53:48 +0000
Subject: [PATCH] Cap villagers' window name to prevent client disconnects
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index ace5d7b..b0a31b7 100644
index 787c764..5788872 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -750,6 +750,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -756,6 +756,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
this.activeContainer.addSlotListener(this);
InventoryMerchant inventorymerchant = ((ContainerMerchant) this.activeContainer).getMerchantInventory();