remove PROTOCOL

EpsilonZunsat · Sep 25, 2023 · 12981fa · 12981fa
1 parent e85056f
commit 12981fa
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 25 deletions.
diff --git a/src/Config.cpp b/src/Config.cpp
@@ -15,10 +15,6 @@ std::string defaultConfig = R"({
     //保存路径为 ./logs/DeathLog.log
     //如果未启用控制台死亡信息，此选项无效
     "EnableDeathLogFile": false,
-    //是否修复龙息伤害定义
-    //在Java版15w31c前，末影龙的龙息攻击使用dragon_breath伤害类型，但之后则改为了indirect_magic伤害类型。
-    //启用此项后死于龙息会有特殊的死亡信息
-    "EnableDragonBreathFix": false,
     //是否启用玩家进退服信息
     "EnableJoin&LeftMessage": false
 })";
@@ -47,9 +43,6 @@ void initConfig() {
     if (Plugin_Config.contains("EnableDeathLogFile") && Plugin_Config["EnableDeathLogFile"].is_boolean()) {
         FileLog = Plugin_Config["EnableDeathLogFile"].get<bool>();
     }
-    if (Plugin_Config.contains("EnableDragonBreathFix") && Plugin_Config["EnableDragonBreathFix"].is_boolean()) {
-        fixDragonBreath = Plugin_Config["EnableDragonBreathFix"].get<bool>();
-    }
     if (Plugin_Config.contains("EnableJoin&LeftMessage") && Plugin_Config["EnableJoin&LeftMessage"].is_boolean()) {
         JLLog = Plugin_Config["EnableJoin&LeftMessage"].get<bool>();
     }

diff --git a/src/DamageCause.cpp b/src/DamageCause.cpp
@@ -9,7 +9,6 @@
 
 extern std::vector<unsigned char> resource;
 
-bool fixDragonBreath = false;
 bool ConsoleLog = false;
 bool FileLog = false;
 bool JLLog = false;
@@ -67,9 +66,6 @@ void regesterDamageCause() {
     GMLib_Mod::addDamageCause(ActorDamageCause::Projectile, "arrow", "minecraft:arrow");
     GMLib_Mod::addDamageCause(ActorDamageCause::Projectile, "thrown");
     //GMLib_Mod::addDamageCause(ActorDamageCause::Projectile, "generic", "null");
-    if (fixDragonBreath) {
-        GMLib_Mod::addDamageCauseWithMessage(ActorDamageCause::Magic, "dragonBreath", "death.attack.dragonBreath.player", "minecraft:ender_dragon");
-    }
 }
 
 void buildResourcePack() {

diff --git a/src/dllmain.cpp b/src/dllmain.cpp
@@ -6,17 +6,6 @@ void PluginInit();
 
 Logger logger(PLUGIN_NAME);
 
-void CheckProtocolVersion() {
-    auto current_protocol = ll::getServerProtocolVersion();
-    if (TARGET_BDS_PROTOCOL_VERSION != current_protocol) {
-        logger.error("Protocol version mismatched! Target version: {}. Current version: {}.", TARGET_BDS_PROTOCOL_VERSION, current_protocol);
-        logger.error("This may result in crash. Please switch to the version matching the BDS version!");
-    }
-    else {
-        PluginInit();
-    }
-}
-
 BOOL APIENTRY DllMain(HMODULE hModule,
                       DWORD ul_reason_for_call,
                       LPVOID lpReserved)
@@ -46,6 +35,6 @@ extern "C"
     _declspec(dllexport) void onPostInit()
     {
         std::ios::sync_with_stdio(false);
-        CheckProtocolVersion();
+        PluginInit();
     }
 }
diff --git a/src/version.h b/src/version.h
@@ -10,8 +10,7 @@
 
 #define PLUGIN_VERSION_MAJOR 5
 #define PLUGIN_VERSION_MINOR 0
-#define PLUGIN_VERSION_REVISION 0
-#define TARGET_BDS_PROTOCOL_VERSION 594
+#define PLUGIN_VERSION_REVISION 1
 
 #define PLUGIN_VERSION_STATUS 2