1
0
Commit Graph

59 Commits

Author SHA1 Message Date
Mattes D
ced076c561 Merge pull request #350 from mc-server/arrows
Fixed arrow bugs
2013-11-19 01:13:49 -08:00
Tiger Wang
bc1e236d54 Redstone Megacommit [SEE DESC]
+ Updated BlockID - look for yourself
* Improved button, repeater, lever, and comparator code ->
simplification and splitting of some stuff from the redstone simulator
file
* Fixed buttons not breaking when in an invalid game state
* Fixed QueueSetBlock -> improved (AGAIN) piston code
+ Rewrote redstone simulator

Fixes: #57, #58, #205, and part of #131.
Fixes FS issues: 281, 116, and 102
2013-11-18 22:30:34 +00:00
Tiger Wang
6ff6929ca6 General fixes [SEE DESC]
* Fixed faulty block face enumeration and functions
+ Added fireworks and exp bottle spawning
* Fixed arrows again
2013-11-16 20:58:17 +00:00
madmaxoft
ceee25bd11 Fixed compiler warning. 2013-11-13 15:53:03 +01:00
Tiger Wang
347162a82f Bundled fixes [SEE DESC]
* BoundingBox now returns FACE_NONE
+ Arrows can be picked up
* Arrows dug up resume physics simulations
* Added sound effects for bows, lava to stone, and arrows
* Fixed SoundParticleEffect on <1.7 protocols
2013-11-12 21:43:20 +00:00
Tiger Wang
71abbb2f56 Bundled fixes [SEE DESC]
* Fixed pickups spawning in an incorrect position from a JukeBox
* Pickups make a popping sound in Prtcl1.7
* Arrows make a *what sort of sound does an arrow make anyway‽* when
hitting a block, and a popping sound when fired
* Mobs again have metadata
* Fixed Prtcl1.7 not using valid JSON to kick a client
* Minecarts and arrows again have metadata
2013-11-10 20:48:12 +00:00
Tiger Wang
f38375a2ec Fixed bow damage in creative
Also reverted indenting change
2013-11-02 16:01:40 +00:00
Tiger Wang
77b3db7e25 Multiple fixes
* Fixed #282
* Fixed bow not taking damage
* Enhanced Player.cpp code
2013-11-02 14:08:00 +00:00
madmaxoft
405d434c06 Fixed pickup spawning with inherited gamemode. 2013-09-21 18:08:30 +02:00
Tiger Wang
846f1223f4 Implemented redstone comparators
They can be placed and toggled, but stills needs proper redstone support
2013-09-18 18:27:21 +01:00
Tiger Wang
480991d1ac Multiple fixes [SEE DESC]
- Removed two random block handling files in the item handling section
that didn't do anything. (One was an attempt at making slabs work, but
failed to realise that the coords would have to be the block CLICKED,
and another was just a random empty file for handling wooden planks.)
* Fixed placing repeater blocks not directioning properly
* Fixed wood directions breaking plank metadata
2013-09-18 00:01:20 +01:00
madmaxoft
5cde7d8a29 Merge branch 'pickups' of git://github.com/tigerw/MCServer into tigerw-pickups
Conflicts:
	source/BlockID.cpp
	source/Entities/Entity.cpp
2013-09-15 20:49:08 +02:00
madmaxoft
2973b17977 Fixed empty-handed itemhandler.
This should fix FS 430.
2013-09-14 08:16:56 +02:00
Tiger Wang
30ac3f5838 Added a few changes [SEE DESC]
* Revised pickup comments
* SlotArea pickup tossing now reflects Player.cpp
* Removed unneeded ItemShears comment (was working already)
* Sand and gravel pickups spawn with correct speed
2013-09-09 19:28:50 +01:00
Tiger Wang
c789a8ddf5 Initial boat support
+ Boats are saved
+ Boats have physics
+ Boats spawn
2013-09-08 00:14:57 +01:00
madmaxoft
d7a5287000 Basic support for thrown items - eggs, snowballs and ender pearls.
They can be thrown, but they don't do anything on impact. Also they don't save to nor load from  MCA.
2013-08-30 18:10:58 +02:00
madmaxoft
17ad4c2610 Shooting a bow kinda works.
The arrow is released, but sometimes hits wrong blocks or disappears completely.
2013-08-30 14:24:03 +02:00
Tiger Wang
52d8da6ebe Fixed lighters replacing blocks 2013-08-23 18:13:54 +01:00
madmaxoft
1a7912744f Moved entities into the Entities subfolder. 2013-08-19 11:39:13 +02:00
Tiger Wang
e64c40115e Compilation and Minecart fixes 2013-08-16 13:04:06 +01:00
Tiger Wang
cbde4f546a Merge remote-tracking branch 'upstream/master' 2013-08-16 11:25:53 +01:00
Tiger Wang
7f87d6c3d6 Feature and bugfixes [SEE DESC]
Added TNT and Hopper minecarts
Fixed piston code failing without an extension set
Repeaters are now broken
Fixed not being able to place a minecart on an activator rail
Added much needed comments on piston code
Fixed minor formatting issue
2013-08-16 11:23:24 +01:00
madmaxoft
0cb00996de Replaced E_ENTITY_TYPE_XXX with cMonster::mtXXX.
Also slightly improved the spawning algorithm.
2013-08-16 10:48:30 +02:00
James Ravenscroft
9f7db50de0 Fixed food handler for mushroom soup - proper food level and saturation are applied and the player receives a wooden bowl back after nomming 2013-08-08 16:32:14 +01:00
bearbin
1d233bdc68 Alpha-sort the foodstuffs. 2013-08-02 07:54:30 +01:00
bearbin
7642fdd194 Add the new food items.
Enchanted golden apples are not required, as they are a meta value and provide the same nourishment as plain golden apples.
2013-08-02 07:46:30 +01:00
Alexander Harkness
53e22b1185 Changed everyting to Unix line endings. 2013-07-29 12:13:03 +01:00
madmaxoft
4746d2251c Implemented basic eating support.
Food is now properly consumed and it takes 1.5 sec.
2013-07-28 19:15:03 +02:00
madmaxoft
e27a5db409 Empty buckets replace fluid buckets on use and vice versa (patch contributed by Mgueydan)
Fixes FS #277.
API change: added an optional parameter to cItemGrid:AddItem(), cItemGrid:AddItems(), cInventory:AddItem() and cInventory:AddItems()

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1643 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-07-03 13:56:11 +00:00
madmaxoft@gmail.com
c867bdac24 Updated the stacking (Patch contributed by Stephen304)
http://forum.mc-server.org/showthread.php?tid=503&pid=8609#pid8609

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1614 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-06-20 18:29:34 +00:00
madmaxoft@gmail.com
b2138b132c More TNT fixes.
Chain-reaction TNTs are spawned in proper coordinates (FS #390)
Centralized Primed TNT entity spawning and made available to the plugins.
Internal changes for better TNT performance.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1604 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-06-18 19:09:51 +00:00
madmaxoft@gmail.com
547c341325 TNT fixes.
Other blocks can be placed next to TNT.
Explosions activate nearby TNT blocks.
TNT doesn't destroy bedrock, obsidian and liquid blocks.
Server doesn't crash when a TNT (or other entity) leaves the valid Y range.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1603 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-06-18 08:24:34 +00:00
madmaxoft@gmail.com
3ee5236284 Removed cLadder, cSign, cStairs, cTorch and cVine classes, moved their functionality into the appropriate BlockHandlers / ItemHandlers
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1555 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-06-04 19:22:14 +00:00
madmaxoft@gmail.com
8eedc8f788 Shears mask the leaves' meta
Fixes FS #367

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1548 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-06-04 12:06:45 +00:00
madmaxoft@gmail.com
cf87169737 Refactored cInventory to use cItemGrid for the actual Storage
This makes the API more orthogonal and is easier to use in the plugins. Also changes in the inventory are now propagated to the needed places (armor updates to BroadcastEntityEquipment etc.) even when the inventory is changed by a plugin.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1503 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-24 07:30:39 +00:00
madmaxoft@gmail.com
90c398a392 Inventory code cleanup, players can now see each other's armor
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1493 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-19 18:22:37 +00:00
keyboard.osh@gmail.com
d48a4507c9 Fixed crash with Minecart. It was getting added twice to the world and it was causing and ASSERT to fail.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1425 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-04-28 04:49:55 +00:00
madmaxoft@gmail.com
2006de2217 Cobwebs are now washed away by water and can be broken by swords and shears, giving string.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1363 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-04-06 18:20:06 +00:00
madmaxoft@gmail.com
d397dd263f Added carrots and potatoes handling, bonemealing and proper lighting.
FS #166

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1359 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-04-05 13:45:00 +00:00
madmaxoft@gmail.com
01b24d73ea Player can sit in minecarts (but not move them yet)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1249 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-03-03 19:05:11 +00:00
madmaxoft@gmail.com
0e2340ee34 Added missing item types, fixed placing stone walls.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1243 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-03-03 14:00:49 +00:00
madmaxoft@gmail.com
d47ff55203 Minecarts can now be placed.
No interaction, no physics, though.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1219 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-02-18 16:48:50 +00:00
madmaxoft@gmail.com
32ee4aaf1e Removed all E_ITEM_ symbols equivalent to E_BLOCK_, and all obsolete item and block symbols.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1218 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-02-16 11:12:56 +00:00
madmaxoft@gmail.com
1a127f5510 Added the HOOK_BLOCK_TO_PICKUPS hook that fires when a block is dug up and should be converted to pickups.
Note that cItems is used in the function signature but not yet exported in the API, TODO!

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1176 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-01-27 02:00:33 +00:00
madmaxoft@gmail.com
0b37949f2a Fixed a possible crash on server restart.
May be related to FS #294

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1161 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-01-21 09:07:18 +00:00
madmaxoft@gmail.com
43e6840719 Merged branch "branches/hooks" into "trunk".
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1139 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-01-12 04:46:01 +00:00
luksor111@gmail.com
4561b2c22f Cauldrons and Brewing Stands are now placeable
Cauldrons can be filled with water and used to fill bottles

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1116 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-12-29 11:49:00 +00:00
luksor111@gmail.com
69107bd54f Fixed slab usage in creative mode
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1112 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-12-27 15:07:12 +00:00
luksor111@gmail.com
ffcfa7c89b Added flower pots
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1107 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-12-27 01:01:16 +00:00
luksor111@gmail.com
eed6f9bb7b Fixed drops for: Stone, Mycelium, Redstone Torch.
Fixed item usage for Jukeboxes and Spawn eggs in survival.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1064 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-11-24 09:50:38 +00:00