keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity
4920 commits 1 branch 2 tags 103 MiB
Commit graph

4920 commits

This branch
This branch
All branches
Author SHA1 Message Date
bloodmc
23cdcb96a9 Call markDirty when restoring blocks with TileEntities. (#2808) 
This change makes sure the updated tileentity is saved properly within the
chunk.
 2016-05-02 15:18:26 -07:00
bloodmc
b53e53dcb7 Call markDirty when restoring blocks with TileEntities. (#2807) 
This change makes sure the updated tileentity is saved properly within the
chunk.
 2016-05-02 15:01:49 -07:00
bloodmc
7c6372202e Fix wrong blockstate being passed to notifyNeighborsRespectDebug. (#2806) 2016-05-02 14:33:35 -07:00
bloodmc
b5bda7117a Only run block physics for TileEntities while capturing block placement. (#2805) 
Currently, all blocks placed by players that are not TE's run physics
twice. Blocks that contain a TileEntity are not affected due to a check in
'ForgeHooks.onPlaceItemIntoWorld'.

In order to fix the problem, 'Chunk.setBlockState' will now verify if
blocks are being captured before running onBlockAdded and if so, only run
physics if the block has a tileentity. This check also prevents blocks
such as TNT's from running its physics (explosion) when placement event is
cancelled.
 2016-05-02 14:23:24 -07:00
Craig Burton
d31cf8ddbc Update ore dictionary (#2721) 
Updated the Ore Dictionary with more vanilla items:
  -Prismarine Shard ( "gemPrismarine" )
  -Prismarine Crystals ( "dustPrismarine" )
  -Prismarine Block ( "blockPrismarine" )
  -Prismarine Brick ( "blockPrismarineBrick" )
  -Dark Prismarine ( "blockDarkPrismarine" )
  -Nether Wart ( "cropNetherWart" )
  -Sugarcane ( "sugarcane" )
  -Paper ( "paper" )
  -Ender Pearl ( "enderpearl" )
  -Bone ( "bone)
  -Gunpowder ( "gunpowder)
  -String ( "string" )
  -Nether Star ( "netherStar" )
  -Leather ( "leather" )
  -Feather ( "feather" )
  -Egg ( "egg" )
  -End Stone ( "endstone" )
  -Torch ( "torch" )
  -Vine ( "vine" )
  -Cactus ( "blockCactus" )
  -Grass ( "grass")
  -Obsidian ( "obsidian" )
  -Red Sandstone ( added to "sandstone" )
  -Crafting Table ( "workbench" )
  -Slime Block ( "blockSlime" )
  -Granite ( "stoneGranite" )
  -Polished Granite ( "stoneGranitePolished" )
  -Diorite ( "stoneDiorite" )
  -Polished Diorite ( "stoneDioritePolished" )
  -Andesite ( "stoneAndesite" )
  -Polished Andesite ( "stoneAndesitePolished" )
 2016-04-07 11:49:31 -07:00
LexManos
ce4d31529d Merge pull request #2714 from nekosune/patch-1 
Corrected CapabilityItemHandler.readNBT ignoring anything in slot 0
 2016-04-05 13:32:55 -07:00
Katrina Swales
f4ca1f61b9 Corrected readNBT ignoring anything in slot 0 2016-04-05 19:44:20 +01:00
LexManos
c7e54b8ecc Merge pull request #2649 from mezz/tooltips 
Make tooltips layout in the right direction, wrap if there is no room
 2016-03-24 19:18:26 -07:00
mezz
eca3b900e0 Make tooltips layout in the right direction, wrap if there is no room 
Fixes #2255
 2016-03-24 19:12:46 -07:00
LexManos
1d21345dfd Merge pull request #2531 from Choonster/finite-fluid-drain-fix 
Allow finite fluids to be drained correctly
 2016-03-21 19:54:53 -07:00
LexManos
76efd93235 Merge pull request #2621 from Thutmose/patch-1 
Fix pushing players inside blocks.
 2016-03-21 19:34:58 -07:00
Thutmose
e349855688 Fix pushing players inside blocks. 
same changes made to the 1.9 branch
 2016-03-21 22:33:35 -04:00
LexManos
b317d5d107 Merge pull request #2605 from Thutmose/playersize 
Fixed players smaller than 1 block not being able to walk under overhang
 2016-03-21 17:15:11 -07:00
Thutmose
cd81cd0934 Allow players sized smaller than 1 block to walk into small spaces 2016-03-21 17:41:41 -04:00
LexManos
3930f6f8bd Merge pull request #2612 from CovertJaguar/master 
Add missing Minecart/Track hook.
 2016-03-21 14:08:40 -07:00
CovertJaguar
f61605c7af Add missing Minecart/Track hook. 2016-03-21 03:18:25 -07:00
LexManos
cc2895b793 Merge pull request #2594 from Corosauce/master 
Fix for patch targetting the wrong field to change for failed pathfinding penalty
 2016-03-20 06:53:53 -07:00
Corosauce
c01e98e25f Fix for patch targetting the wrong field to change for failed pathfinding penalty 2016-03-20 02:05:38 -04:00
LexManos
ba80ead005 Merge pull request #2539 from bonii-xx/bugfix 
Fix CombinedInvWrapper accessing incorrect slots
 2016-03-12 16:33:06 -08:00
Bernhard Bonigl
bcab92daf6 Fix CombinedInvWrapper accessing incorrect slots 
Closes #2533
 2016-03-12 22:17:57 +01:00
Choonster TheMage
9ca3ede736 Allow finite fluids to be drained correctly 2016-03-07 21:31:27 +11:00
LexManos
250a77b359 Merge pull request #2476 from Abastro/fovfixes 
Added Event: EntityViewRenderEvent#FOVModifier
 2016-02-29 13:20:46 -08:00
LexManos
0e35c3125a Merge pull request #2500 from me4502/master 
Added local click position to PlayerInteractEvent. Fixes #2482
 2016-02-27 01:21:25 -08:00
Matthew Miller (Me4502)
f1ad05dd8e Added local click position to PlayerInteractEvent. 2016-02-27 11:27:21 +10:00
Abastro
c4ca8270b9 Added EntityViewRenderEvent#FOVModifier 
Enables mods to modify raw FOV directly.
Avoids modifier limit from FOVUpdateEvent.
Aware of blocks which are needed for fov change related with materials.
 2016-02-27 09:25:19 +09:00
LexManos
ecfb9accaa Fixed dummy blocks not being removed from registry on dedicated server correctly. Closes #2487 
Also added some more debug logs!
 2016-02-24 16:56:20 -08:00
LexManos
0dd796fb16 Merge pull request #2497 from bonii-xx/universal_bucket 
Fix WordServer.canCreatureTypeSpawnHere not using Forge Events.
 2016-02-23 01:04:09 -08:00
Bernhard Bonigl
17e960c158 Fix WordServer.canCreatureTypeSpawnHere not using Forge Events. 
Followup of #2496
 2016-02-23 09:53:26 +01:00
LexManos
76f867561d Merge pull request #2495 from elix-x/master 
Increased actual maximum fuel burn time
 2016-02-22 11:31:39 -08:00
LexManos
b009546a94 Merge pull request #2496 from bonii-xx/universal_bucket 
Fix WorldEvent.PotentialSpawns Event passing the list instance of the…
 2016-02-22 11:16:55 -08:00
Bernhard Bonigl
de1c270644 Fix WorldEvent.PotentialSpawns Event passing the list instance of the ChunkProvider to users 2016-02-22 18:45:31 +01:00
elix-x
0ddd897446 Increased actual maximum fuel burn time 
Increased actual maximum fuel burn time from 32767 to 2147483647.
Backwards compatible.
 2016-02-22 18:16:45 +01:00
RainWarrior
e495b7599c ModelLoader: added verbose error logging showing items/blockstates associated with model locations; removed redundant cast leftover from ungenerified code; fixed up a couple of warnings. 2016-02-22 03:53:26 +03:00
cpw
3e4107a222 Fix race condition when using indexed codec in a LAN server. Fixes spurious crash when LAN server is running. 2016-02-20 16:04:31 -05:00
cpw
c88bc769ef Log when it's likely the indexedcodec is gonna fail, because of LAN server derps likely. Try and give some context for debuggers. 2016-02-19 23:18:46 -05:00
Fry
34382745ab Merge pull request #2488 from bonii-xx/universal_bucket 
Fix universal bucket logging an exception
 2016-02-19 13:27:59 +03:00
Bernhard Bonigl
9b128aaed2 Fix universal bucket logging an exception 2016-02-19 11:17:23 +01:00
LexManos
fe340a213f Merge pull request #2485 from AlgorithmX2/world_getLightOpacity 
Test getLightOpacity(world,pos) in World as well as the chunk.
 2016-02-18 19:11:55 -08:00
AlgorithmX2
9eb22c3154 Test getLightOpacity(world,pos) in World as well as the chunk. 2016-02-18 20:43:24 -06:00
LexManos
ad69f0f447 Merge pull request #2443 from AlgorithmX2/cap_pickup_entityitem 
Preserve ItemStack Caps when picking Items up.
 2016-02-18 14:10:32 -08:00
AlgorithmX2
e6b3c7ba64 Preserve ItemStack Caps when picking Items up. 2016-02-18 16:08:23 -06:00
LexManos
c0915526ff Merge pull request #2429 from AlgorithmX2/in_material_hooks 
In Material Hooks - For Swimming, Overlays, Boats, and Fishing.
 2016-02-18 13:40:41 -08:00
AlgorithmX2
3c4a2b0f42 In material Liquid Hooks. 2016-02-18 14:41:15 -06:00
LexManos
1b3699d90b Merge pull request #2481 from diesieben07/potion-draw-fix 
Fix Potion.shouldRenderInvText
 2016-02-17 17:50:18 -06:00
Take Weiland
50f77a71ae Fix Potion.shouldRenderInvText 2016-02-18 00:37:57 +01:00
LexManos
6f9e63e3ee Merge pull request #2478 from AlgorithmX2/pre_getLightOpacity 
Fix bug with getLightOpacity based on TileEntities,
 2016-02-17 14:16:50 -06:00
AlgorithmX2
5c229dd6c7 Fix bug with getLightOpacity based on TileEntities, 
Capture getLightOpacity prior to removing the tile entity.
 2016-02-17 14:14:18 -06:00
LexManos
f77d50b48c Fix loading of world ID maps for worlds without dummy data. Closes #2477 2016-02-17 12:06:57 -08:00
LexManos
13a25ee0ba Merge pull request #2474 from bonii-xx/universal_bucket 
Fix customized bucket names not getting translated correctly
 2016-02-17 13:31:12 -06:00
RainWarrior
e8915b6a55 Added default levels for fluid extended properties in fluid model. 2016-02-16 14:13:19 +03:00