Mattes D
55a5f11b1b
Fixed right-click with bonemeal.
...
The client would send invalid right-click events with Y set to 0x7ff, which would crash the server. Only process bonemeal for valid clicks (valid blockface).
2015-06-23 15:23:11 +02:00
Mattes D
3889b2cac2
Refactored block placement workflow.
...
Multi-blocks can now use the default OnPlayerPlaced() callback in cItemHandler.
2015-06-21 19:49:22 +02:00
tycho
e19693e529
Merge branch 'master' into PreventNewWarnings
...
Conflicts:
src/Inventory.cpp
2015-05-28 11:05:41 +01:00
Alexander Harkness
da4a76bb50
Merge pull request #2061 from mc-server/fixes
...
Fixes
2015-05-27 12:21:17 +01:00
tycho
a6ccee5948
Merge branch 'master' into PreventNewWarnings
2015-05-24 17:27:05 +01:00
worktycho
bd95d7bf7b
Merge pull request #2091 from Rakete1111/master
...
Placing buckets up to 25 blocks away #2059
2015-05-24 13:44:34 +01:00
tycho
dae9e5792a
Made -Weverything an error.
2015-05-24 12:56:56 +01:00
tycho
81c0116cf1
Merge branch 'master' into PreventNewWarnings
2015-05-23 07:33:52 -07:00
Lukas Pioch
e30b2ed487
Fixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher.
2015-05-23 16:28:37 +02:00
Blitz Rakete
e512b7bf8e
Fixes #2059
2015-05-21 19:03:51 +02:00
tycho
77f1f58c0a
Make -Werror disabling file only
...
Ad fix a load of warnings
2015-05-19 19:32:10 +01:00
Tiger Wang
0dbba305b6
Fixes #2052
2015-05-18 14:30:16 +01:00
Mattes D
846d16315a
CheckBasicStyle: checks spaces around * and &.
2015-05-09 12:58:55 +02:00
Mattes D
c13b1931ff
More style checking.
...
Spaces around some operators are checked.
2015-05-09 12:58:54 +02:00
jammet
61300ab9ef
Rabbit and cooked rabbit now stackable
...
And corrected the alphabetical ordering.
2015-05-09 12:56:23 +02:00
Tri125
429e545167
Fixed #1893
...
Quartz ore now stack properly
2015-05-07 11:49:11 -04:00
Mattes D
e51bd6bcd8
Merge pull request #1851 from wraith11/DoorFix
...
Fix door placing in connection with slabs
2015-04-23 00:55:51 +02:00
Mattes D
5f0a78200b
Merge pull request #1852 from wraith11/SlabPlacing
...
Fix slab placing
2015-04-23 00:54:59 +02:00
wraith11
85c37dd3a0
Fix slab placing
2015-04-22 23:01:21 +02:00
wraith11
794013315b
Fix door placing in connection with slabs
...
Except top-half slabs as transparent blocks for doors.
2015-04-21 20:47:02 +02:00
Mattes D
b97f41b8c6
ItemHandler type fixes.
2015-04-20 09:17:26 +02:00
Mattes D
c9fbcea66d
ItemHandler: Using automatic array bounds.
2015-04-20 08:34:44 +02:00
Mattes D
ffe7dae4fc
Fixed PolishedGranite et al crafting recipes.
...
Fixes #1774 . Ref.: #1859
2015-04-16 20:59:57 +02:00
Mattes D
d421befece
Scooping up fluid calls the player placement hooks.
...
Ref.: #1857 .
2015-04-14 10:55:48 +02:00
Mattes D
de8e5ea8e4
Placing a fluid from bucket calls plugin hooks.
...
Ref.: #1857 .
2015-04-14 10:49:01 +02:00
Mattes D
53f5cc209f
Fixed placing bottom half-slabs by clicking a top half-slab.
...
Ref.: #1837
2015-03-28 10:44:42 +01:00
Mattes D
e5a7a730ed
Merge pull request #1826 from mc-server/UnifyPacketizer
...
Unify packetizer
2015-03-24 13:09:41 +01:00
Mattes D
cc069ccb2a
Changed cEntity::m_UniqueID to UInt32.
2015-03-21 15:18:17 +01:00
Tommy Santerre
3f6d823aa4
Correct world height validations.
...
Unify the way we test block above the current one (Height - 1 instead of a_RelY + 1).
Allow generation of world of flat height = 255
2015-03-19 20:32:17 -04:00
Tiger Wang
3d398baf35
cPainting saving implemented
...
Additionally, it now inherits from cHangingEntity.
2015-03-13 23:05:06 +00:00
Mattes D
88fc70a06a
Fixed door placement.
...
Doors now have hinges on the correct side, based on what the surroundings are when placing them.
2015-02-28 17:16:21 +01:00
Mattes D
1bcc4abd68
Door handler: Removed needless check.
...
The Y coord has already been checked above.
2015-02-21 14:23:37 +01:00
Freddie Wang
b165ab6363
Fix door placement check
2015-02-21 14:22:05 +01:00
Mattes D
45b1d5ff78
Fixed various warnings.
2015-01-18 18:01:24 +01:00
Mattes D
19ff14752e
MobHead: Fixed wither spawning.
2014-12-25 20:41:27 +01:00
Mattes D
eddbce64be
MobHeads: fixed regular head placement.
2014-12-25 20:41:12 +01:00
Mattes D
9e478c6f29
Fixed door placement.
2014-12-25 01:00:51 +01:00
Mattes D
1af6210466
Fixed forgotten big flower handler.
2014-12-25 00:51:24 +01:00
Mattes D
f07784b92f
Fixed redstone dust placement on upside-down slabs.
2014-12-24 19:44:15 +01:00
Mattes D
ccdf03daaf
Refactored all player block placing to go through hooks.
...
Fixes #1618 .
2014-12-24 07:20:17 +01:00
Masy98
6e8e1c6d8d
Added Rabbits
2014-12-20 10:31:34 +01:00
Masy98
706b9181e6
Merge branch 'master' into entities
2014-12-18 19:32:48 +01:00
Masy98
c836b52dd1
Added Entity Guardian
2014-12-18 19:30:32 +01:00
Howaner
2a8c234f46
Fixes
2014-12-13 20:31:37 +01:00
Howaner
8e753fa590
Added cocoa pod.
2014-12-01 18:10:37 +01:00
Tiger Wang
a26541a7c3
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
Howaner
f800f3c998
Moved tall grass pickups handle.
2014-10-21 18:06:44 +02:00
Howaner
7631047bb7
Leaves are harvest-able.
2014-10-07 18:24:22 +02:00
Howaner
a5e09155c0
Corrected drops from dead bush, tall grass and cobweb.
2014-10-07 18:21:39 +02:00
Masy98
3591edd47e
Fixed sorting
2014-10-01 19:26:36 +02:00
Masy98
0d2a041a69
Fixed Red Sandstone and Prismarine drops
2014-10-01 19:13:59 +02:00
Howaner
425df6b694
Fixed 1.8 dirt types
2014-09-30 20:31:27 +02:00
Mattes D
2c5b0f2378
Merge pull request #1415 from Masy98/blocks
...
Added 1.8 Blocks and Items
2014-09-26 22:24:45 +02:00
Masy98
9106a8c29b
Moved curly brace to seperate line
2014-09-26 19:45:03 +02:00
Tycho
a3f940f47c
Removed more unessicary includes
2014-09-26 18:13:19 +01:00
Masy98
2feee3b316
Merge branch 'master' into blocks
...
Conflicts:
src/Items/ItemHandler.cpp
src/Simulator/IncrementalRedstoneSimulator.cpp
2014-09-26 18:32:31 +02:00
Tycho
9c459cbe50
Merge branch 'master' into redstoneTests
...
Conflicts:
src/Mobs/Monster.h
2014-09-25 15:22:08 +01:00
Tycho
045d54e0e2
Merge branch 'master' into redstoneTests
...
Conflicts:
src/Blocks/ChunkInterface.h
2014-09-17 18:47:33 +01:00
Tycho
6e7c0e33b5
Added first test to show the object can be created
2014-09-17 18:40:10 +01:00
Howaner
92e7e5c615
Merge branch 'master' into 1.8-Protocol
2014-09-14 14:16:17 +02:00
Tiger Wang
fdabfd77e2
Improved cBlockHandler::DropBlock
2014-09-13 22:49:27 +01:00
Mattes D
5b63a7fe98
Merge pull request #1353 from mc-server/Effects
...
Added speed entity effect.
2014-09-13 17:05:59 +02:00
Howaner
69afc4dbba
Merge branch 'master' into 1.8-Protocol
...
Conflicts:
src/Items/ItemHoe.h
2014-09-13 01:21:43 +02:00
Howaner
96e03fc3ea
Added extra mushroom handler.
2014-09-12 19:34:19 +02:00
Howaner
1223a24d3c
Merge branch 'master' into Effects
2014-09-12 19:13:46 +02:00
Howaner
fcf558173e
Fixed farmland issues.
2014-09-12 19:07:20 +02:00
Howaner
80b0631c43
Only place farmland if no block is upper than dirt/grass.
2014-09-12 18:21:11 +02:00
Howaner
a40eb93c33
Added hoe interact sound.
2014-09-12 18:15:49 +02:00
Masy98
7f42ba9fc1
Fixed 1.8 Item stacking and block harvesting
2014-09-12 16:48:37 +02:00
Howaner
d07ef85ee3
Spawn exp if you break a mob spawner.
2014-09-12 16:41:23 +02:00
Howaner
3f000deb3b
Disabled mobspawner itemdrop.
2014-09-12 15:59:46 +02:00
Howaner
f2c5d8a761
Fixed many right click issues.
2014-09-12 13:19:33 +02:00
Masy98
d4641576c0
Added new doors in ItemDoor.h
2014-09-11 16:33:52 +02:00
Masy98
a01994389d
Fixed mutton name in Sheep.cpp
2014-09-11 16:24:16 +02:00
Masy98
b185e7f4e6
Fixed mutton name in ItemHandler
2014-09-11 16:11:03 +02:00
Masy98
8c3cd18cdd
Added 1.8 food to the food list
2014-09-11 15:57:36 +02:00
archshift
19067b27de
In 1.8, carrots and potatoes yield one less hunger point.
2014-09-03 16:18:58 -07:00
madmaxoft
1cc65b6264
Fixed style and alpha-sorting.
2014-09-03 10:29:10 +02:00
archshift
34d6f0713e
Added mutton, which sheep now drop when killed
2014-09-02 23:21:08 -07:00
Howaner
d3b8100a7b
Merge branch 'master' into Effects
2014-09-02 20:03:42 +02:00
madmaxoft
9a4e8bf83f
Merge remote-tracking branch 'Hircine/Enchantments'
2014-09-01 14:03:39 +02:00
Howaner
0fdb177208
Fixed potion removing in creative mode.
2014-08-30 12:46:26 +02:00
Tiger Wang
431b7ed0b7
Merge branch 'master' of https://github.com/mc-server/MCServer
...
Conflicts:
src/Server.cpp
2014-08-29 14:56:40 +01:00
Tiger Wang
114b14faad
Removed unused code
2014-08-29 13:44:01 +01:00
Howaner
b5ffe06f88
Code formatting fixes.
2014-08-19 22:14:37 +02:00
Jaume Aloy
596203e692
Fixes
...
- Changed m_TicksLeftBurning > 0 for IsOnFire()
- Tried to do the changes in BlockHandler.cpp
- Removed m_Creator in ArrowEntity
- Added m_Enchantments in ProjectileEntity CreatorData
- Added blank lines between functions
2014-08-19 17:57:32 +02:00
Jaume Aloy
d3fd63c9eb
Added some Enchantments
...
- Bow enchantments: Infinity, Flame and Power
- Sword and tools enchantments: Fire Aspect, Bane of Arthropods, Smite,
Sharpness
2014-08-19 12:38:15 +02:00
archshift
d2d0ffee21
Fixed unsigned long comparison to size_t
2014-08-04 19:43:33 -07:00
Howaner
2e43eaaba7
Changed arrow comment.
2014-08-04 22:30:13 +02:00
Howaner
434ea542e1
Added arrow consuming on shooting
2014-08-04 21:48:33 +02:00
Mattes D
d2744713bb
Merge pull request #1272 from Howaner/Food
...
Fixed hunger bugs, Implemented golden apple, added jump statistic, added...
2014-08-01 17:43:18 +02:00
Howaner
84462ba8b2
Fixed hunger bugs, Implemented golden apple, added jump statistic, added correct food effects.
2014-07-31 23:04:00 +02:00
Howaner
bffad50436
Fixed water from ice and removed packed ice drop.
2014-07-31 18:41:48 +02:00
madmaxoft
fd4ee20b2a
Hotfixed compilation problems.
2014-07-27 23:15:51 +02:00
Mattes D
0814a977f8
Merge pull request #1236 from Howaner/Inventory2
...
Fix item durability.
2014-07-27 21:39:39 +02:00
Howaner
c2a2aea9f8
Derp.
2014-07-26 17:09:59 +02:00
Howaner
4de8f5ca29
Rename function.
2014-07-26 13:26:14 +02:00
Howaner
ba36e79bc5
Merge branch 'master' into Inventory2
...
Conflicts:
src/BlockInfo.cpp
2014-07-26 13:23:11 +02:00
archshift
60d4a16514
Fixed indentations, removed redundant init code in SplashPotionEntity.cpp
2014-07-26 03:48:16 -07:00
archshift
0298d34406
Moved potion static functions to EntityEffect to create splash potions through world
2014-07-26 03:48:16 -07:00
Tiger Wang
3a6002de5b
Fixed block drops
...
* Fixes #1242 (the issue addressed within)
2014-07-24 21:38:25 +01:00
Howaner
396739cc0f
Fix item durability.
...
Fixes #1181
2014-07-23 16:32:09 +02:00
Tiger Wang
18a0b60c12
Merge remote-tracking branch 'origin/master' into saplingsandleaves
...
Conflicts:
src/Defines.h
2014-07-22 18:30:31 +01:00
madmaxoft
93d29555e5
Style: Normalized to no spaces before closing parenthesis.
2014-07-21 17:40:43 +02:00
madmaxoft
6be79575fd
Style: Normalized spaces after if, for and while.
2014-07-21 17:38:50 +02:00
Tiger Wang
d0e7b2f18b
Merge branch 'master' into saplingsandleaves
...
Conflicts:
src/Bindings/DeprecatedBindings.cpp
src/Blocks/BlockSapling.h
2014-07-20 12:02:23 +01:00
madmaxoft
00c524519e
Fixed style: spaces after commas.
2014-07-19 14:53:41 +02:00
Mattes D
4293db5eae
Merge pull request #1214 from mc-server/anti-glob
...
CMake - Explicitly lists all source files
2014-07-19 14:29:22 +02:00
archshift
f5bcfdc58c
Splash potions: Renamed PotionParticleType to PotionColor for clarity
2014-07-19 02:51:39 -07:00
archshift
725d1fd1e2
Subdirs: Only add_library if not using MSVC
2014-07-18 17:41:43 -07:00
archshift
465743757a
Items/CMakeLists.txt: Replaced glob with list of files
2014-07-18 17:41:42 -07:00
Howaner
eeacb6f222
Added a extra wall sign handler.
...
Fixes #1119
2014-07-18 02:19:30 +02:00
Tiger Wang
0f8c24e04d
Fixed issues relating to saplings and leaves
...
- Removed cBlockInfo::RequiresSpecialTool
* Fixes #1195
* Fixes #1201
2014-07-17 22:26:53 +01:00
madmaxoft
c03161f75d
Fixed tabs used for alignment.
2014-07-17 23:16:55 +02:00
madmaxoft
d0cc9aedb3
More trailing whitespace fixes.
2014-07-17 23:16:54 +02:00
madmaxoft
5e198c6730
Basic style fixes.
2014-07-17 22:50:58 +02:00
madmaxoft
2423fbf2ef
Normalized comments.
...
This was mostly done automatically and then visually inspected for obvious errors.
All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
2014-07-17 22:15:34 +02:00
madmaxoft
64c8b0d51b
Reformatted cItemPotionHandler.
2014-07-17 10:51:44 +02:00
madmaxoft
e66b81b395
Merge remote-tracking branch 'origin/master' into potions
2014-07-17 10:06:13 +02:00
Tiger Wang
960fcaa90c
Fixed a bug with buckets
...
* Additionally fixed cLineBlockTracer's EntryFace parameter when a block
was hit on the first iteration along the projected line
2014-07-16 22:22:00 +01:00
madmaxoft
8e946da8ac
Merge branch 'master' into potions
2014-07-15 09:01:32 +02:00
Tiger Wang
f0187cc8f9
Fixed placing liquids over liquids
...
* Fixes #1182
2014-07-14 21:55:46 +01:00
archshift
40bb98510a
ItemHandler.cpp: removed redundant food and drink checks
2014-07-14 13:46:43 -07:00
archshift
061010288a
Readability and clarity changes
2014-07-14 13:46:43 -07:00
Tycho
2a0c041ad8
Adjusted calls to CreateProjectile that passed Items
2014-07-13 15:25:52 +01:00
Howaner
d529971e27
Changed BroadcastSoundEffect function to take floating pos.
2014-07-13 02:08:02 +02:00
Tiger Wang
945dfe75d7
Comment grammar correction
2014-07-12 22:52:45 +01:00
Tiger Wang
9f4348fb09
Simplified buckets code slightly
2014-07-12 22:50:28 +01:00
Tiger Wang
084dec6ccf
Merge pull request #1162 from daniel0916/Fixes
...
Fix for bucket placing
2014-07-12 22:09:50 +01:00
daniel0916
68668d7a6e
Changes
2014-07-12 12:44:59 +02:00
archshift
4e6395d6ff
For now, removed creator member from Entity Effect for pointer safety
2014-07-11 17:27:29 -07:00
daniel0916
ca6bcacdb9
Changes
2014-07-11 17:58:35 +02:00
daniel0916
a8efb62088
Changes
2014-07-10 17:46:07 +02:00
daniel0916
944c04a209
Maybe fixed whitespaces
2014-07-10 16:38:19 +02:00
daniel0916
47ceb9e79d
Maybe fixed whitespaces
2014-07-10 16:36:28 +02:00
daniel0916
a11ad977ce
Fixed Bucket Placing
2014-07-10 16:10:42 +02:00
archshift
e824cd09b3
Merge remote-tracking branch 'origin/master' into potions
...
Conflicts:
src/Entities/Player.cpp
src/Entities/ProjectileEntity.cpp
2014-07-09 23:28:27 -07:00
Tiger Wang
da1d946b2b
Fixed bow charge
2014-07-09 22:04:26 +01:00
daniel0916
98950af634
Fixed Bucket placing
2014-07-09 16:53:01 +02:00
Howaner
64e6667435
Only fixes the server crash.
2014-07-01 20:34:50 +02:00
Howaner
64f6ddf1e2
Fix server-crash with non-existing items.
2014-07-01 14:47:49 +02:00
Tiger Wang
61cb08b546
Implemented tripwire(s) (hooks)
...
* Fixes #944
2014-06-28 20:44:34 +01:00
Howaner
eaf36766f6
Merge branch 'master' into Bow
2014-06-26 15:49:53 +02:00
archshift
e8143de01b
Nullify deleted pointers.
2014-06-19 01:49:56 -07:00
archshift
f5529e544c
EntityEffects.x -> EntityEffect.x, Object-Oriented effects
...
Changed effect map to take a pointer of the effect as a result.
2014-06-18 22:54:14 -07:00
archshift
9e8361976b
Entity Effects: Clarified user, added it to AddEntityEffect
...
Added second AddEntityEffect with a pass-by-value of the class.
2014-06-17 11:39:22 -07:00
madmaxoft
e289fe4dd7
Changed the AddEntityEffect() params for easier calls.
2014-06-17 11:39:21 -07:00
madmaxoft
045ae2ef2c
Fixed MSVC compilation.
2014-06-17 11:39:21 -07:00
archshift
5b2b6e0615
Pawn: renamed HandleEntityEffects to HandleEntityEffect
...
Exported entity effect functions for ToLua and documented them in APIDesc.lua
2014-06-17 11:39:21 -07:00
archshift
68011a004a
Removed long function wrapping
2014-06-17 11:39:20 -07:00
