R3944Realms/CarryOn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.12

Browse Source
This commit is contained in:
Tschipp 2017-11-04 11:39:23 +01:00
commit 5ccc660fef
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/tschipp/carryon/client/event/RenderEvents.java
View File

@ -188,9 +188,7 @@ public class RenderEvents
if (!stack.isEmpty() && stack.getItem() == RegistrationHandler.itemTile && ItemTile.hasTileData(stack)) if (!stack.isEmpty() && stack.getItem() == RegistrationHandler.itemTile && ItemTile.hasTileData(stack))
{ {
if(Loader.isModLoaded("realrender") || Loader.isModLoaded("rfpr")) if(Loader.isModLoaded("realrender") || Loader.isModLoaded("rfpr"))
{
return; return;
}
Block block = ItemTile.getBlock(stack); Block block = ItemTile.getBlock(stack);
NBTTagCompound tag = ItemTile.getTileData(stack); NBTTagCompound tag = ItemTile.getTileData(stack);

4
src/main/java/tschipp/carryon/common/event/ItemEvents.java
View File

@ -258,7 +258,9 @@ public class ItemEvents
EntityItem item = new EntityItem(world); EntityItem item = new EntityItem(world);
item.setItem(stack); item.setItem(stack);
BlockPos pos = player.getPosition(); BlockPos pos = original.getBedLocation();
if(pos == null)
pos = player.getPosition();
item.setPosition(pos.getX(), pos.getY(), pos.getZ()); item.setPosition(pos.getX(), pos.getY(), pos.getZ());
world.spawnEntity(item); world.spawnEntity(item);
} }