diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-12-17 17:33:30 +0100 |
|---|---|---|
| committer | Howaner <franzi.moos@googlemail.com> | 2014-12-17 17:33:30 +0100 |
| commit | 6ee7fd3c6792235c873e24b16331e3a8278021cc (patch) | |
| tree | 707fb63ebda192bad5603c5c280d99746b510cc4 /MCServer | |
| parent | Implemented vanilla-like shift click. (diff) | |
| parent | Merge pull request #1674 from gushromp/master (diff) | |
| download | cuberite-6ee7fd3c6792235c873e24b16331e3a8278021cc.tar cuberite-6ee7fd3c6792235c873e24b16331e3a8278021cc.tar.gz cuberite-6ee7fd3c6792235c873e24b16331e3a8278021cc.tar.bz2 cuberite-6ee7fd3c6792235c873e24b16331e3a8278021cc.tar.lz cuberite-6ee7fd3c6792235c873e24b16331e3a8278021cc.tar.xz cuberite-6ee7fd3c6792235c873e24b16331e3a8278021cc.tar.zst cuberite-6ee7fd3c6792235c873e24b16331e3a8278021cc.zip | |
Diffstat (limited to 'MCServer')
| -rw-r--r-- | MCServer/Plugins/APIDump/APIDesc.lua | 4 | ||||
| m--------- | MCServer/Plugins/Core | 0 | ||||
| -rw-r--r-- | MCServer/crafting.txt | 6 | ||||
| -rw-r--r-- | MCServer/furnace.txt | 1 |
4 files changed, 7 insertions, 4 deletions
diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua index 72dcce5e4..ba3763724 100644 --- a/MCServer/Plugins/APIDump/APIDesc.lua +++ b/MCServer/Plugins/APIDump/APIDesc.lua @@ -2564,7 +2564,9 @@ World:ForEachEntity( if not(a_Entity:IsMob()) then return; end - local Monster = tolua.cast(a_Entity, "cMonster"); -- Get the cMonster out of cEntity, now that we know the entity represents one. + + -- Get the cMonster out of cEntity, now that we know the entity represents one. + local Monster = tolua.cast(a_Entity, "cMonster"); if (Monster:GetMobType() == mtSpider) then Monster:TeleportToCoords(Monster:GetPosX(), Monster:GetPosY() + 100, Monster:GetPosZ()); end diff --git a/MCServer/Plugins/Core b/MCServer/Plugins/Core -Subproject 39d980e3a3447ac23f61c7d65426b33ee6c0718 +Subproject 6e9d612b9eb548d888d2bf986488aad762a99be diff --git a/MCServer/crafting.txt b/MCServer/crafting.txt index 4d28b1f52..a24fdee0c 100644 --- a/MCServer/crafting.txt +++ b/MCServer/crafting.txt @@ -277,12 +277,12 @@ ActivatorRail, 6 = IronIngot, 1:1, 1:2, 1:3, 3:1, 3:2, 3:3 | Stick, 2:1, 2:3 | R #******************************************************# # Mechanisms # -WoodenDoor, 3 = OakPlanks, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3 SpruceDoor, 3 = SprucePlanks, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3 BirchDoor, 3 = BirchPlanks, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3 JungleDoor, 3 = JunglePlanks, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3 AcaciaDoor, 3 = AcaciaPlanks, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3 DarkOakDoor, 3 = DarkOakPlanks, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3 +WoodenDoor, 3 = OakPlanks, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3 IronDoor, 3 = IronIngot, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3 TrapDoor, 2 = Planks, 1:1, 2:1, 3:1, 1:2, 2:2, 3:2 IronTrapDoor = IronIngot, 1:1, 1:2, 2:1, 2:2 @@ -358,21 +358,21 @@ IronBars, 16 = IronIngot, 1:1, 2:1, 3:1, 1:2, 2:2, 3:2 Paper, 3 = Sugarcane, 1:1, 2:1, 3:1 Book = Paper, *, *, * | leather, * Bookandquill = Book, * | feather, * | inksac, * -Fence, 3 = OakPlanks, 1:1, 1:2, 3:1, 3:2 | Stick, 2:1, 2:2 SpruceFence, 3 = SprucePlanks, 1:1, 1:2, 3:1, 3:2 | Stick, 2:1, 2:2 BirchFence, 3 = BirchPlanks, 1:1, 1:2, 3:1, 3:2 | Stick, 2:1, 2:2 JungleFence, 3 = JunglePlanks, 1:1, 1:2, 3:1, 3:2 | Stick, 2:1, 2:2 DarkOakFence, 3 = DarkOakPlanks, 1:1, 1:2, 3:1, 3:2 | Stick, 2:1, 2:2 AcaciaFence, 3 = AcaciaPlanks, 1:1, 1:2, 3:1, 3:2 | Stick, 2:1, 2:2 +Fence, 3 = OakPlanks, 1:1, 1:2, 3:1, 3:2 | Stick, 2:1, 2:2 Cobblestonewall, 6 = cobblestone, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3 mossycobblestonewall, 6 = mossycobblestone, 1:2, 1:3, 2:2, 2:3, 3:2, 3:3 NetherBrickFence, 6 = NetherBrick, 1:1, 2:1, 3:1, 1:2, 2:2, 3:2 -FenceGate = Stick, 1:1, 1:2, 3:1, 3:2 | OakPlanks, 2:1, 2:2 SpruceFenceGate = Stick, 1:1, 1:2, 3:1, 3:2 | SprucePlanks, 2:1, 2:2 BirchFenceGate = Stick, 1:1, 1:2, 3:1, 3:2 | BirchPlanks, 2:1, 2:2 JungleFenceGate = Stick, 1:1, 1:2, 3:1, 3:2 | JunglePlanks, 2:1, 2:2 DarkOakFenceGate = Stick, 1:1, 1:2, 3:1, 3:2 | DarkOakPlanks, 2:1, 2:2 AcaciaFenceGate = Stick, 1:1, 1:2, 3:1, 3:2 | AcaciaPlanks, 2:1, 2:2 +FenceGate = Stick, 1:1, 1:2, 3:1, 3:2 | OakPlanks, 2:1, 2:2 Bed = Planks, 1:2, 2:2, 3:2 | Wool, 1:1, 2:1, 3:1 GoldIngot = GoldNugget, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3 EyeOfEnder = EnderPearl, * | BlazePowder, * diff --git a/MCServer/furnace.txt b/MCServer/furnace.txt index 7179b5299..fb8d63677 100644 --- a/MCServer/furnace.txt +++ b/MCServer/furnace.txt @@ -49,6 +49,7 @@ NetherQuartzOre = NetherQuartz Sand = Glass Pork = CookedPork RawBeef = Steak +Potato = BakedPotato RawChicken = CookedChicken Clay = Brick ClayBlock = HardenedClay |