summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MCServer/crafting.txt6
-rw-r--r--MCServer/webadmin/login_template.html12
-rw-r--r--MCServer/webadmin/template.lua10
-rw-r--r--SetFlags.cmake4
-rw-r--r--src/OSSupport/NetworkSingleton.cpp5
-rw-r--r--src/UI/Window.cpp8
6 files changed, 30 insertions, 15 deletions
diff --git a/MCServer/crafting.txt b/MCServer/crafting.txt
index 46ac3332e..243e52fdb 100644
--- a/MCServer/crafting.txt
+++ b/MCServer/crafting.txt
@@ -76,8 +76,8 @@ NetherBrick = netherbrickitem, 1:1, 1:2, 2:1, 2:2
Glowstone = GlowstoneDust, 1:1, 1:2, 2:1, 2:2
Wool = String, 1:1, 1:2, 2:1, 2:2
TNT = Gunpowder, 1:1, 3:1, 2:2, 1:3, 3:3 | Sand, 2:1, 1:2, 3:2, 2:3
-PillarQuartzBlock = QuartzSlab, 1:1, 1:2
-ChiseledQuartzBlock, 2 = QuartzBlock, 1:1, 1:2
+PillarQuartzBlock, 2 = QuartzBlock, 1:1, 1:2
+ChiseledQuartzBlock = QuartzSlab, 1:1, 1:2
HayBale = Wheat, 1:1, 1:2, 1:3, 2:1, 2:2, 2:3, 3:1, 3:2, 3:3
SnowBlock = SnowBall, 1:1, 1:2, 2:1, 2:2
ClayBlock = Clay, 1:1, 1:2, 2:1, 2:2
@@ -475,7 +475,7 @@ PurpleCarpet, 3 = PurpleWool, 1:1, 2:1
BlueCarpet, 3 = BlueWool, 1:1, 2:1
BrownCarpet, 3 = BrownWool, 1:1, 2:1
GreenCarpet, 3 = GreenWool, 1:1, 2:1
-RedCarpet, 3 = RedWool, 1:1, 2:2
+RedCarpet, 3 = RedWool, 1:1, 2:1
BlackCarpet, 3 = BlackWool, 1:1, 2:1
WhiteCarpet, 3 = WhiteWool, 1:1, 2:1
diff --git a/MCServer/webadmin/login_template.html b/MCServer/webadmin/login_template.html
index 26b260bd3..fb6f21b52 100644
--- a/MCServer/webadmin/login_template.html
+++ b/MCServer/webadmin/login_template.html
@@ -1,7 +1,7 @@
<!-- Copyright Justin S and MCServer Team, licensed under CC-BY-SA 3.0 */ -->
<html>
<head>
- <title>MCServer WebAdmin - Login</title>
+ <title>Cuberite WebAdmin - Login</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link href="login.css" rel="stylesheet" type="text/css">
<link rel="icon" href="favicon.ico">
@@ -10,7 +10,7 @@
<div class="contention">
<div class="row1">
<div class="wrapper">
- <img src="logo_login.png" alt="MCServer Logo" class="logo">
+ <img src="logo_login.png" alt="Cuberite Logo" class="logo">
</div>
</div>
<div id="panel">
@@ -51,17 +51,17 @@
<div class="upper">
<div class="wrapper">
<ul class="menu bottom_links">
- <li><a href="http://www.mc-server.org" target="_blank">MCServer</a></li>
+ <li><a href="http://cuberite.org" target="_blank">Cuberite</a></li>
<li><a href="http://forum.mc-server.org" target="_blank">Forums</a></li>
<li><a href="http://builds.cuberite.org" target="_blank">Buildserver</a></li>
- <li><a href="http://mc-server.xoft.cz/LuaAPI" target="_blank">API Documentation</a></li>
- <li><a href="http://book.mc-server.org/" target="_blank">User's Manual</a></li>
+ <li><a href="http://api-docs.cuberite.org" target="_blank">API Documentation</a></li>
+ <li><a href="http://book.cuberite.org/" target="_blank">User's Manual</a></li>
</ul>
</div>
</div>
<div class="lower">
<div class="wrapper">
- <span id="copyright">Copyright © <a href="http://www.mc-server.org" target="_blank">MCServer Team</a> 2014.</span>
+ <span id="copyright">Copyright © <a href="http://www.cuberite.org" target="_blank">Cuberite Team</a>.</span>
</div>
</div>
</div>
diff --git a/MCServer/webadmin/template.lua b/MCServer/webadmin/template.lua
index f210a2ce8..5b3ecf152 100644
--- a/MCServer/webadmin/template.lua
+++ b/MCServer/webadmin/template.lua
@@ -56,7 +56,7 @@ end
function ShowPage(WebAdmin, TemplateRequest)
SiteContent = {}
local BaseURL = WebAdmin:GetBaseURL(TemplateRequest.Request.Path)
- local Title = "MCServer WebAdmin"
+ local Title = "Cuberite WebAdmin"
local NumPlayers = cRoot:Get():GetServer():GetNumPlayers()
local MemoryUsageKiB = cRoot:GetPhysicalRAMUsage()
local NumChunks = cRoot:Get():GetTotalChunkCount()
@@ -177,17 +177,17 @@ function ShowPage(WebAdmin, TemplateRequest)
<div class="upper">
<div class="wrapper">
<ul class="menu bottom_links">
- <li><a href="http://www.mc-server.org" target="_blank">MCServer</a></li>
+ <li><a href="http://cuberite.org" target="_blank">Cuberite</a></li>
<li><a href="http://forum.mc-server.org" target="_blank">Forums</a></li>
<li><a href="http://builds.cuberite.org" target="_blank">Buildserver</a></li>
- <li><a href="http://mc-server.xoft.cz/LuaAPI" target="_blank">API Documentation</a></li>
- <li><a href="http://book.mc-server.org/" target="_blank">User's Manual</a></li>
+ <li><a href="http://api-docs.cuberite.org" target="_blank">API Documentation</a></li>
+ <li><a href="http://book.cuberite.org/" target="_blank">User's Manual</a></li>
</ul>
</div>
</div>
<div class="lower">
<div class="wrapper">
- <span id="copyright">Copyright © <a href="http://www.mc-server.org" target="_blank">MCServer Team</a> 2014.</span>
+ <span id="copyright">Copyright © <a href="http://www.cuberite.org" target="_blank">Cuberite Team</a>.</span>
</div>
</div>
</div>
diff --git a/SetFlags.cmake b/SetFlags.cmake
index 57cab5a1c..ca5f1d289 100644
--- a/SetFlags.cmake
+++ b/SetFlags.cmake
@@ -94,6 +94,10 @@ macro(set_flags)
OUTPUT_VARIABLE GCC_VERSION)
endif()
+ if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm")
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}" "-fomit-frame-pointer")
+ endif()
+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++11")
set(CMAKE_CXX_FLAGS_COVERAGE "${CMAKE_CXX_FLAGS_COVERAGE} -std=c++11")
diff --git a/src/OSSupport/NetworkSingleton.cpp b/src/OSSupport/NetworkSingleton.cpp
index 358e24438..417fab01e 100644
--- a/src/OSSupport/NetworkSingleton.cpp
+++ b/src/OSSupport/NetworkSingleton.cpp
@@ -93,7 +93,6 @@ cNetworkSingleton & cNetworkSingleton::Get(void)
void cNetworkSingleton::Terminate(void)
{
ASSERT(!m_HasTerminated);
- m_HasTerminated = true;
// Wait for the LibEvent event loop to terminate:
event_base_loopbreak(m_EventBase);
@@ -113,6 +112,10 @@ void cNetworkSingleton::Terminate(void)
event_base_free(m_EventBase);
libevent_global_shutdown();
+
+ // Set the HasTerminated flag:
+ // (Only set the flag after everything has been removed, to avoid the random failures in the Google-test, caused by links terminating after this flag was set)
+ m_HasTerminated = true;
}
diff --git a/src/UI/Window.cpp b/src/UI/Window.cpp
index 61e25651b..dbdcbeaa8 100644
--- a/src/UI/Window.cpp
+++ b/src/UI/Window.cpp
@@ -605,6 +605,10 @@ void cWindow::OnLeftPaintEnd(cPlayer & a_Player)
}
SendWholeWindow(*a_Player.GetClientHandle());
+
+ // To fix #2345 (custom recipes don't work when inventory-painting), we send the result slot explicitly once again
+ // This is a fix for what seems like a client-side bug
+ a_Player.GetClientHandle()->SendInventorySlot(m_WindowID, 0, *GetSlot(a_Player, 0));
}
@@ -629,6 +633,10 @@ void cWindow::OnRightPaintEnd(cPlayer & a_Player)
}
SendWholeWindow(*a_Player.GetClientHandle());
+
+ // To fix #2345 (custom recipes don't work when inventory-painting), we send the result slot explicitly once again
+ // This is a fix for what seems like a client-side bug
+ a_Player.GetClientHandle()->SendInventorySlot(m_WindowID, 0, *GetSlot(a_Player, 0));
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 07:51:33 +0100