Martin McArthur
d8865339f5
implemented DoesIgnoreBuildCollision on BlockFire to allow blocks to be placed on top
2015-06-14 12:53:09 +01:00
Lane Kolbly
dafdded7d9
Fixed typo in BlockDoor.h
2015-06-13 08:00:20 -05:00
Alexander Harkness
1e77f27191
Merge pull request #2144 from mc-server/comparators
...
Redstone improvements [SEE DESC]
2015-06-09 09:15:08 +01:00
Tiger Wang
de5b1401f8
Comparators
2015-06-06 12:21:09 +01:00
Mattes D
48c153bf53
Fixed warnings in MSVC.
...
It complained about undefined return values or using uninitialized variables.
2015-06-02 12:51:43 +02: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
tycho
1577a080ee
Merge branch 'master' into PreventNewWarnings
2015-05-23 11:31:03 +01:00
worktycho
c0d7b4d569
Merge pull request #2030 from beeduck/master
...
Issue #1868 and Issue #1984
2015-05-21 07:50:30 +01:00
b33duck
ed3c0b771f
Added open/close and sound effects for all door types
2015-05-20 16:24:16 -07:00
Julian Laubstein
48b7874099
Added missing fencetypes to torchhandler
2015-05-20 23:18:21 +02:00
tycho
77f1f58c0a
Make -Werror disabling file only
...
Ad fix a load of warnings
2015-05-19 19:32:10 +01:00
tycho
fa4fb75e03
Fixed compile and a few more warnings
2015-05-19 12:28:31 +01:00
tycho
95e06ab93f
Merge branch 'master' into PreventNewWarnings
...
Conflicts:
src/Blocks/BlockLeaves.h
2015-05-19 11:55:23 +01:00
tycho
f2689c4887
Fixed a lot of warnings
2015-05-19 11:50:59 +01:00
Alexander Harkness
aedf9d05cb
Improved leaves a bit more.
...
Should fix #2058 .
2015-05-18 13:43:00 +01:00
Alexander Harkness
d48825fa81
Fix sapling probability.
...
Probability is 5% of leaves drop a sapling.
This should really be different for jungle leaves (2.5%) and the Fortune enchantment should increase the probability.
2015-05-17 14:23:16 +01:00
Alexander Harkness
c9880b9cb5
Fixed bad logic.
2015-05-16 16:58:43 +01:00
Alexander Harkness
bda9b3e342
Should Fix sign flipping.
...
Fixes #1118
2015-05-16 16:49:47 +01:00
worktycho
6350e4f279
Bed uses bottom two bits for direction not three
2015-05-16 12:07:38 +01:00
Mattes D
c13b1931ff
More style checking.
...
Spaces around some operators are checked.
2015-05-09 12:58:54 +02:00
jammet
6e3c584f07
Clay blocks are handled with the OreHandler
2015-04-29 10:14:34 +02:00
jammet
e42beb51ab
Digging up a clay block spawns 4 clay items.
...
Fixes #1884 .
Closes #1891 .
2015-04-23 21:39:10 +02:00
jammet
6f0eafdc3a
Nether Quartz is handled in the Ore handler.
...
Fixes #1885 , Closes #1888
2015-04-23 15:21:14 +02: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
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
ffe7dae4fc
Fixed PolishedGranite et al crafting recipes.
...
Fixes #1774 . Ref.: #1859
2015-04-16 20:59:57 +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
afdd751fe3
Merge pull request #1799 from SnappingTurtles/BlockButton
...
Buttons can be placed on the top and on the bottom face of a block
2015-04-03 15:41:39 +02:00
Alexandre Guertin
97daf810ff
Removed 0x6, 0x7 from BlockButton.
2015-03-25 16:12:02 -04:00
Mattes D
e5a7a730ed
Merge pull request #1826 from mc-server/UnifyPacketizer
...
Unify packetizer
2015-03-24 13:09:41 +01:00
Mattes D
f1ef7f57ff
Merge pull request #1775 from tommysanterre/terrainheightfix
...
Correct all world height validations.
2015-03-23 12:25:22 +01:00
Mattes D
cc069ccb2a
Changed cEntity::m_UniqueID to UInt32.
2015-03-21 15:18:17 +01:00
Mattes D
8a43da0723
Merge pull request #1822 from mc-server/ResettableLuaCallback
...
Added cPluginLua::cResettable interface, used for scheduled tasks.
2015-03-20 16:11:50 +01:00
Mattes D
781c8683f7
Added cPluginLua::cResettable interface, used for scheduled tasks.
...
This allows plugins to register objects that can "survive" the plugin unloading - they will simply bail out if the plugin is already unloaded, instead of referencing bad plugin data.
Fixes #1556 .
2015-03-20 15:13:33 +01:00
bibo38
3058c4c010
Removed Metavalue from Piston drops. Bugfix #1765
2015-03-20 11:14:42 +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
worktycho
83531707f3
Merge pull request #1811 from mc-server/grass
...
Fixed grass spread, closes #1743
2015-03-15 12:16:37 +00:00
Mattes D
65d2ef32e9
Merge pull request #1734 from mc-server/pistons
...
Handle client 'leave bed' request
2015-03-14 22:44:04 +01:00
Tiger Wang
e94886c140
Fixed grass spread, closes #1743
...
- Removed the salt parameter in cFastRandom functions, it wasn't doing
what we thought it was following the move to C++11
2015-03-14 00:59:53 +00:00
Alexandre Guertin
adf5edc913
Buttons can be placed on the top and on the bottom face of a block
2015-03-09 18:13:55 -04:00
Howaner
a96c21fc0d
Merge branch 'master' into Inventory
2015-03-09 22:39:11 +01:00
Tiger Wang
f3da0cf1ae
Reverted non-functional changes
2015-03-05 21:21:39 +00:00
Alexander Harkness
7348bf3853
Grass checks for sufficient light before spreading
2015-03-05 19:30:00 +00:00
STRWarrior
e63b4f4913
Added experience drops when mining ores
2015-02-28 16:34:17 +01:00
Tiger Wang
3869f76cc2
Handle client 'leave bed' request
...
* Fixes #1728
2015-02-08 21:21:48 +00:00
Howaner
1eedccc56a
Merge branch 'master' into Inventory
2015-01-25 00:34:19 +01:00
Kirill Kirilenko
14ea50cbe7
Fixed defect #43661 in Coverity list.
2015-01-23 19:06:23 +03:00
Mattes D
9e478c6f29
Fixed door placement.
2014-12-25 01:00:51 +01:00
Mattes D
ccdf03daaf
Refactored all player block placing to go through hooks.
...
Fixes #1618 .
2014-12-24 07:20:17 +01:00
Howaner
6ee7fd3c67
Merge branch 'master' into Inventory
2014-12-17 17:33:30 +01:00
Mattes D
4947880a5d
Merge pull request #1581 from mc-server/redstone
...
Resplit redstone .inc file and provided improvements
2014-12-17 08:38:23 +01:00
Tiger Wang
8d9049603b
NULL -> nullptr
2014-12-16 23:18:59 +00:00
Howaner
bed456033f
"& 0x0f" isn't needed
2014-12-14 13:14:48 +01:00
Howaner
2a8c234f46
Fixes
2014-12-13 20:31:37 +01:00
Howaner
a595a4a842
Merge branch 'master' into Cocoa
2014-12-13 20:10:23 +01:00
Howaner
b6fd400276
Own classes for all windows.
2014-12-13 15:06:55 +01:00
Tiger Wang
4b20a61519
Merge branch 'master' into redstone
2014-12-13 12:11:01 +00:00
Mattes D
e2a04f580a
BasicStyle: Added missing braces to control statements.
2014-12-05 16:59:11 +01:00
Howaner
8e753fa590
Added cocoa pod.
2014-12-01 18:10:37 +01:00
Howaner
42120e2ea5
Merge branch 'master' into MobSpawner
...
Conflicts:
MCServer/Plugins/Core
2014-11-18 14:56:32 +01:00
Tiger Wang
85c298d73e
Cleaned up simulators
2014-10-25 21:54:00 +01:00
Tiger Wang
6fbc98def2
Fixed some block checks
...
* Fixes #1330
2014-10-25 00:22:31 +01:00
Alexander Harkness
57f822cd0e
Signs can be placed on wallsigns.
...
Fixes #1438
2014-10-23 08:07:20 +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
283eda3c4e
Merge branch 'master' into BlockFixes
2014-10-21 17:37:03 +02:00
Julian Laubstein
403f8581cf
Added mechanics placeable on halfslabs
2014-10-19 15:01:01 +02:00
Mattes D
eeb580a74e
Functions in cPluginManager get references instead of pointers.
2014-10-15 19:09:09 +02:00
Alexander Harkness
6af9d5ba01
Fixed compilation.
2014-10-11 18:39:46 +01:00
Howaner
a5e09155c0
Corrected drops from dead bush, tall grass and cobweb.
2014-10-07 18:21:39 +02:00
Howaner
e8e428a806
Corrected IsBlockAttachable() in BlockVine.h
2014-10-07 16:48:37 +02:00
Howaner
fec509935d
Removed BlockHaybale.h from CMakeLists.txt
2014-10-07 15:39:24 +02:00
Howaner
e3a69a527d
Removed unused cBlockHayBaleHandler.
2014-10-07 15:02:51 +02:00
Mattes D
db98820aa9
Merge pull request #1489 from mc-server/fixes
...
Improved torch handler
2014-10-04 10:02:10 +02:00
Tiger Wang
79e9de8d67
Comment suggestions
2014-10-03 21:38:23 +01:00
Masy98
1d875d0bc8
Added Daylight Sensors to the "can't push" list
2014-10-01 18:08:31 +02:00
Masy98
cc9e598803
Added missing 1.8 blocks, E_METAs and sounds
2014-10-01 17:57:53 +02:00
Tiger Wang
48c99dcd2e
Improved torch handler
2014-09-30 22:00:33 +01:00
Howaner
7d3016c7ad
Code improvements
2014-09-30 20:59:59 +02:00
Howaner
425df6b694
Fixed 1.8 dirt types
2014-09-30 20:31:27 +02:00
Howaner
83973520c8
Fixed iron trapdoors
2014-09-30 20:04:49 +02:00
Howaner
5111628ba5
Fixed 1.8 doors.
2014-09-30 19:49:42 +02:00
Julian Laubstein
b77480b4ef
Indentation
2014-09-30 14:05:23 +02:00
Julian Laubstein
b2cf4004f8
Set right indentation
2014-09-30 12:45:44 +02:00
Julian Laubstein
d731ad37b1
actual solving of the halfslap+torch problem
2014-09-30 12:43:48 +02:00
madmaxoft
aae90c2cf0
Style fixes.
2014-09-29 21:38:11 +02:00
Alexander Harkness
bdb8d916c0
Fixed codestyle again.
2014-09-29 19:45:12 +01:00
w00tc0d3
9628733df2
BlockStone.h: fix the codestyle
2014-09-29 19:19:17 +02:00
netchip
6127c21af9
BlockStone: drop the right cobblestone on onBreak().
...
Signed-off-by: netchip <w00tc0d3@outlook.com>
2014-09-29 17:18:20 +02:00
Julian Laubstein
f014d8764b
Update BlockTorch.h
2014-09-29 13:17:24 +02:00
Julian Laubstein
0b438b5fe8
Added torches placeable on upside-down-halfslaps
2014-09-29 13:12:50 +02:00
madmaxoft
e7de548c89
Fixed minor style issues.
2014-09-27 21:37:36 +02:00
Masy98
6dd47e783a
Added default value to switch and spruce gate to fence gate handler
2014-09-27 15:11:35 +02:00
Masy98
485bac2818
Fixed convertToPickups for fence gates
2014-09-27 14:23:58 +02:00
Masy98
30f9a4d3ab
Fixed convertToPickups for doors
2014-09-27 14:19:45 +02:00
Howaner
033d16babb
Merge branch 'master' into MobSpawner
...
Conflicts:
src/MobSpawner.h
src/Mobs/Monster.h
2014-09-26 23:56:20 +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
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
799c96661d
Fixed style
2014-09-25 15:45:39 +01:00
Tycho
9c459cbe50
Merge branch 'master' into redstoneTests
...
Conflicts:
src/Mobs/Monster.h
2014-09-25 15:22:08 +01:00
Howaner
718eb227ab
Implemented mob spawner.
2014-09-19 23:00:54 +02:00
madmaxoft
95af3eb526
Fixed minor style issues.
2014-09-17 23:32:14 +02: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
Tiger Wang
fdabfd77e2
Improved cBlockHandler::DropBlock
2014-09-13 22:49:27 +01:00
Howaner
d5306f265b
Only drop flint or gravel, not both.
2014-09-12 19:38:00 +02:00
Howaner
fcf558173e
Fixed farmland issues.
2014-09-12 19:07:20 +02:00
Masy98
5cf114da39
Added Sea Lantern drops
2014-09-12 17:01:03 +02:00
Howaner
d07ef85ee3
Spawn exp if you break a mob spawner.
2014-09-12 16:41:23 +02:00
Howaner
abcae75992
Fixed iron ore drop.
2014-09-12 14:08:56 +02:00
Howaner
1849e620fc
Added flint drop and fence gate meta reset.
2014-09-12 13:49:08 +02:00
Tycho
0b044e1c83
Possibly decoupled IncrementalRedstoneSimulator from the rest of the server
...
THis wil hopefully allow for unit testing
2014-09-11 17:48:21 +01:00
Masy98
741791ecfc
Added barrier block
2014-09-11 16:07:54 +02:00
Masy98
e34767b265
Fixed incorrect handlers
2014-09-11 15:39:37 +02:00
Masy98
214cc0f15d
Added stone slab in BlockSlab.h
2014-09-10 21:50:46 +02:00
Masy98
a9b4b60c80
Added new blocks to the BlockInfo
2014-09-10 21:44:04 +02:00
Masy98
f173cfe430
Added new blocks to the BlockHandler
2014-09-10 21:15:06 +02:00
Mattes D
76d5aa1d51
Merge pull request #1402 from Masy98/Sounds
...
Moved sound-configs into BlockID.h and fixed/ added loads of sounds
2014-09-10 08:36:33 +02:00
Masy98
65e6b1e50e
Removed old sound-configuration for SignPosts
2014-09-09 20:10:37 +02:00
Masy98
a171a6ce93
Removed old sound-configuration for Repeaters
2014-09-09 19:50:35 +02:00
Masy98
27edb7f0d0
Removed old sound-configuration for Trapdoors
2014-09-09 19:37:07 +02:00
Masy98
6cc4ac0bca
Removed old sound-configuration for doors
2014-09-09 16:28:08 +02:00
Masy98
acae3c9c65
Moved sound-configs into BlockID.h and fixed/ added loads of sounds
2014-09-09 16:00:26 +02:00
Tycho
2c945c8818
TimeOfDay does not need to be an Int64
2014-09-08 19:07:45 +01:00
madmaxoft
9a4e8bf83f
Merge remote-tracking branch 'Hircine/Enchantments'
2014-09-01 14:03:39 +02:00
worktycho
365d2447d0
Check range of y in HasNearLog
...
Fixes #803
2014-08-31 00:15:48 +01:00
Jaume Aloy
4900645b28
Added a_Digger check
2014-08-30 00:27:33 +02:00
Mattes D
97c4c057e4
Fixed conversion warning.
2014-08-29 11:20:33 +03:00
Hownaer
c2260addf4
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-08-28 18:58:58 +02:00
Hownaer
eaf33e22cf
Fixed anvil placing.
2014-08-28 18:57:56 +02:00
Mattes D
52a6b30f32
Merge remote-tracking branch 'origin/master' into CraftingFixes
2014-08-28 16:53:36 +03:00
Mattes D
49ac6fadfc
Fixed spaces after "template" keyword.
2014-08-28 16:44:36 +03:00
Jaume Aloy
7d771953c0
More Enchantments
...
- Added Thorns and Respiration enchantments
2014-08-22 11:49:49 +02:00
Jaume Aloy
19d1c976e7
Protection Enchantments, some fixes
...
- Protection echantments (fire, blast, feather falling, protection and
projectile). It isn't finished, add secondary effects and optimize the
code.
- Removed some brackets.
- Silk touch fixed.
2014-08-21 12:08:38 +02:00
Howaner
f7774ec336
Merge branch 'master' into Fire
2014-08-20 22:25:05 +02:00
Howaner
67fc19301e
Removed old classes from the CMakeLists.txt
2014-08-20 12:14:56 +02:00
Howaner
b5ffe06f88
Code formatting fixes.
2014-08-19 22:14:37 +02:00
Jaume Aloy
5008eb8c83
Changed if in BlockHandler
2014-08-19 18:40:42 +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
07350de514
Changed if for switch
2014-08-19 16:47:33 +02:00
Jaume Aloy
1897f678f9
Added more enchantments and some fixes
...
- Removed Debug messages
- Added Punch enchantment effect
- Added Silk Touch enchantment
- Added Unbreaking enchantment effect
2014-08-19 16:08:17 +02:00
Howaner
74fabb079c
Moved the clicked-through block check to the top of the function.
2014-08-11 22:34:33 +02:00
Howaner
938bf1df69
Changed comment.
2014-08-10 17:12:08 +02:00
Howaner
ebfc0fdc67
Added comment.
2014-08-08 22:04:53 +02:00
Howaner
3d68466ab0
Send the old slab to the client when the interact cancelled.
2014-08-08 18:55:05 +02:00
Tiger Wang
0b9eb20b92
Fixed signs not staying on other signs
2014-08-04 21:22:08 +01:00
Mattes D
35cfbfd51a
Merge pull request #1269 from Howaner/BlockEntitys
...
Added beacon.
2014-08-01 17:43:02 +02:00
